OSDN Git Service

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
authorRoland Levillain <rpl@google.com>
Tue, 4 Jul 2017 11:31:30 +0000 (11:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Jul 2017 11:31:30 +0000 (11:31 +0000)
commitd3f26b67312ccd5f0b1ecc43a0b2eed244285d07
tree64ac4fb42c13cae1f85d87a62eb1ec5f8c86cb25
parent8f682322716a1719728c69c0bc3614ee3271b8c7
parent10c314e19a6b9cdbff9ff8c99ac1923d47966ebb
Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""
am: 10c314e19a

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