| commit | 3b775e8a7838628b7a0d45b16bce77d33c7062aa | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 14 06:27:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 14 06:27:10 2020 +0000 |
| tree | c36d35efb738df08a4f2ef9e1799fbba152b7b3b | |
| parent | 8229e6fee69586fc3323ebcc02ae3ac5e9293a39 [diff] | |
| parent | cc47efa6f0a4d00d54c41bf3bb1cf2e62682856f [diff] |
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9 am: cc47efa6f0 Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 4bf3e90..bd542e1 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java
@@ -517,7 +517,7 @@ * The absence of a connection type. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562) + @SystemApi public static final int TYPE_NONE = -1; /**