OSDN Git Service

Merge "ConnectivityManager: allow usage of TYPE_NONE"
authorHugo Benichi <hugobenichi@google.com>
Wed, 5 Jul 2017 14:33:35 +0000 (14:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 14:33:35 +0000 (14:33 +0000)
commit0537f1651630ed14f9974c6b62e4497260f9e194
tree21a4c8b3859dbb15ea2bfcabcd3ac523993896f5
parent0a7f5cc9d607eee92441e28d0d72fa5d26e6f2f8
parent279f32ded531319d47c0ee55c606c4d627c62082
Merge "ConnectivityManager: allow usage of TYPE_NONE"
am: 279f32ded5

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962
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