Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f68 am: 41e94b11c8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885

Change-Id: Ib842dd5097904e3ce9da1cb1ceff0325031dfd79
This commit is contained in:
Remi NGUYEN VAN
2020-12-02 10:34:34 +00:00
committed by Automerger Merge Worker
parent 53f60a1e18 41e94b11c8
commit 24ea402272
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -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_NO_ERROR = 0; // 0x0
field @Deprecated public static final int TETHER_ERROR_PROVISION_FAILED = 11; // 0xb field @Deprecated public static final int TETHER_ERROR_PROVISION_FAILED = 11; // 0xb
field public static final int TYPE_NONE = -1; // 0xffffffff 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 field @Deprecated public static final int TYPE_WIFI_P2P = 13; // 0xd
} }

2
core/java/android/net/ConnectivityManager.java
View File

@@ -684,7 +684,7 @@ public class ConnectivityManager {
* {@hide} * {@hide}
*/ */
@Deprecated @Deprecated
@UnsupportedAppUsage @SystemApi
public static final int TYPE_PROXY = 16; public static final int TYPE_PROXY = 16;
/** /**