Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 5dccc26e60 am: d38176e41a am: f073553dcf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885 Change-Id: Ib51a3218d736ab905379f20fbb059bb97b2297ef
2020-12-02 10:55:57 +00:00
parent d58b4ea78c f073553dcf
commit 336220dce3
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -684,7 +684,7 @@ public class ConnectivityManager {
     * {@hide}
     */
    @Deprecated
-    @UnsupportedAppUsage
+    @SystemApi
    public static final int TYPE_PROXY = 16;

    /**