OSDN Git Service

DO NOT MERGE: Support timeouts for requestNetwork() invocations.
authorErik Kline <ek@google.com>
Wed, 25 Nov 2015 03:49:38 +0000 (12:49 +0900)
committerLorenzo Colitti <lorenzo@google.com>
Thu, 8 Dec 2016 08:13:01 +0000 (17:13 +0900)
commit3841a48d0a093bbbd6ffe6338170e1e2dbc11997
tree01aabb1b67e3a1c0e6298ea878493f50903eb295
parentaccd5fcb79e1cd1b6c9cff7b14ff4c9ba78019a6
DO NOT MERGE: Support timeouts for requestNetwork() invocations.

(cherry-pick of 06c3ef1367e850746eef0a5462bdce8674d74c30)
(cherry picked from commit 57faba9ec73fbb311d5ca1df3278aee9728589d5)

Bug: 21414325
Change-Id: I1a58823a372154589f972b98c4c428eab0e0523e
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java