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

Commit f3a89e67 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f am:... 

Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f am: 41e94b11 am: 24ea4022

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

Change-Id: Ib51a3218d736ab905379f20fbb059bb97b2297ef
parents 98ce694b 24ea4022

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6506,6 +6506,7 @@ package android.net { 
    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 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

  }

































core/java/android/net/ConnectivityManager.java



+1
−1




























Original line number
Diff line number
Diff line








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













     * {@hide}















     */















    @Deprecated













    @UnsupportedAppUsage













    @SystemApi















    public static final int TYPE_PROXY = 16;































    /**