diff options
| author | 2020-12-02 09:23:27 +0000 | |
|---|---|---|
| committer | 2020-12-02 09:23:27 +0000 | |
| commit | 71cd774f6849ed5ef2adaa15837c9f585ed25735 (patch) | |
| tree | 5ccab9ea2b0cd9bf01ca062173a80847e567a4cc | |
| parent | dfe8d9caedf017c2321a4dfea7e2df7d9cd568bc (diff) | |
| parent | 7f159cf6401fe76cc1e8d89124f83228c9a7994a (diff) | |
Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi"
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index bb72096ab270..44917df36e2b 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -5986,6 +5986,7 @@ package android.net { field @Deprecated public static final int TETHER_ERROR_NO_ERROR = 0; // 0x0 field @Deprecated public static final int TETHER_ERROR_PROVISION_FAILED = 11; // 0xb field public static final int TYPE_NONE = -1; // 0xffffffff + field @Deprecated public static final int TYPE_PROXY = 16; // 0x10 field @Deprecated public static final int TYPE_WIFI_P2P = 13; // 0xd } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index c28a901fba75..cf5d4e579f85 100644 --- 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; /** |