commit dda5e9254786321bf438160ff65427ef761c06e8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 15 11:42:11 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 15 11:42:11 2020 +0000
tree 52efbe2aae2826565739e88986a3e622d37ee1f4
parent bd7fa9958430e4fd134aef0db3df1ae47aa8837d
parent 5ae1d2c043de811478916e77a914d93ed6e5146e

Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ee62edc..9253ced 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4318,6 +4318,7 @@
     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 {

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 67d4eb1..674c58d 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -662,7 +662,7 @@
      * {@hide}
      */
     @Deprecated
-    @UnsupportedAppUsage
+    @SystemApi
     public static final int TYPE_WIFI_P2P    = 13;
 
     /**