Merge changes from topic 'cm_request_to'

am: d6877b2576 Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d
2017-02-16 14:23:18 +00:00
parent 95d22b0c92 d6877b2576
commit 0a8122afa9
2 changed files with 4 additions and 14 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4163,7 +4163,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
        }
        ensureRequestableCapabilities(networkCapabilities);

-        if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {
+        if (timeoutMs < 0) {
            throw new IllegalArgumentException("Bad timeout specified");
        }