| commit | abf06a174d5b7460cd2f8489989448b8e821a361 | [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 | 640fa9a6ac5489c3d1c205ca5e765748532d1fcc [diff] | |
| parent | de99f55513d398cfe9a9847eac021d75f8e4e02f [diff] |
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: baf25cde90 am: 385ec77624 am: de99f55513 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; /**