OSDN Git Service

Merge changes I0d0c0fac,Ifb9b00b6
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 16 Jan 2018 14:25:13 +0000 (14:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 16 Jan 2018 14:25:13 +0000 (14:25 +0000)
commitc3a209382cc05d532a4872670730023526e2c537
tree417cb2247b526a6e87c46432d2a77460f37dd961
parenta04d0cc72fbf6f0ced26abf2ade3cb2e56236ca2
parentaa7f7e4a6ad3f15f234ca90deedd1cd6015c0abc
Merge changes I0d0c0fac,Ifb9b00b6

* changes:
  Split updateCapabilities into two methods.
  More strictly check NetworkCapabilities callbacks.
services/core/java/com/android/server/ConnectivityService.java
tests/net/java/com/android/server/ConnectivityServiceTest.java