| commit | cc47efa6f0a4d00d54c41bf3bb1cf2e62682856f | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 14 06:17:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 14 06:17:26 2020 +0000 |
| tree | a69e6a7a9afca4e027f88a1ffe6ada449d7f2235 | |
| parent | 53aa51e02f7937da747af09e5ceb3640f06566c7 [diff] | |
| parent | 837d7c87a94a5b22db87f336a2ece3123fba8d55 [diff] |
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9 Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 3c85649..929edf0 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; /**