Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e

Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
2020-01-15 12:16:25 +00:00
parent dbefc5e6ac fe7146187e
commit 968f5a9665
2 changed files with 2 additions and 1 deletions
--- 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 {
--- 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;

    /**