Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 968f5a96 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e925 am: fe714618 

Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
parents dbefc5e6 fe714618

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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 {

































core/java/android/net/ConnectivityManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -662,7 +662,7 @@ public class ConnectivityManager {













     * {@hide}















     */















    @Deprecated













    @UnsupportedAppUsage













    @SystemApi















    public static final int TYPE_WIFI_P2P    = 13;































    /**