diff options
| author | 2020-01-15 04:03:29 -0800 | |
|---|---|---|
| committer | 2020-01-15 04:03:29 -0800 | |
| commit | fe7146187e7fd361626c1d38c0f681f4d4cb3153 (patch) | |
| tree | 52efbe2aae2826565739e88986a3e622d37ee1f4 | |
| parent | 80cc1ede37cfbe697a0219d6310aaa84ef46fdce (diff) | |
| parent | dda5e9254786321bf438160ff65427ef761c06e8 (diff) | |
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"
am: dda5e92547
Change-Id: I27cb6214bf5a42c9120dd871228b224cd41e1199
| -rwxr-xr-x | 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/api/system-current.txt b/api/system-current.txt index ee62edc9cd05..9253cede5ac2 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4318,6 +4318,7 @@ package android.net { field public static final int TETHER_ERROR_NO_ERROR = 0; // 0x0 field 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_WIFI_P2P = 13; // 0xd } public abstract static class ConnectivityManager.OnStartTetheringCallback { diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 67d4eb1c57ee..674c58d00dcd 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -662,7 +662,7 @@ public class ConnectivityManager { * {@hide} */ @Deprecated - @UnsupportedAppUsage + @SystemApi public static final int TYPE_WIFI_P2P = 13; /** |