OSDN Git Service

DO NOT MERGE: [CS] Remove timeout event after first available
authorEtan Cohen <etancohen@google.com>
Thu, 27 Oct 2016 22:05:50 +0000 (15:05 -0700)
committerLorenzo Colitti <lorenzo@google.com>
Thu, 8 Dec 2016 08:13:37 +0000 (17:13 +0900)
commitbf3b1bad15f45033d409669ac20e4b4e597065fd
treed506c6a98c18805500f4dbdd9dba124f6072e100
parent5d2654124e9e77dbda102a4435595c552cbc8e36
DO NOT MERGE: [CS] Remove timeout event after first available

Guarantees that timeouts are only delivered if a network never
becomes available. Once a network is available the timeout is
canceled.

Bug: 31402633
Test: all timeout related unit tests pass (new one added)

(cherry picked from commit 681fcda5896fd6c94f8a543ef9983c0a0644e87e)

Change-Id: I7cd3086544c881915fc6dbf14b87a24ab0cd8748
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/com/android/server/ConnectivityServiceTest.java