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

Commit af116298 authored by Chalard Jean's avatar Chalard Jean Committed by Gerrit Code Review
Browse files

Merge "Move constants to MODULE_LIB"

parents f3d84f44 7a38a3a2

packages/Connectivity/framework/api/module-lib-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ package android.net { 
    field public static final String PRIVATE_DNS_MODE_OFF = "off";

    field public static final String PRIVATE_DNS_MODE_OPPORTUNISTIC = "opportunistic";

    field public static final String PRIVATE_DNS_MODE_PROVIDER_HOSTNAME = "hostname";

    field public static final int PROFILE_NETWORK_PREFERENCE_DEFAULT = 0; // 0x0

    field public static final int PROFILE_NETWORK_PREFERENCE_ENTERPRISE = 1; // 0x1

  }



  public final class NetworkAgentConfig implements android.os.Parcelable {

packages/Connectivity/framework/api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ package android.net { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void unregisterTetheringEventCallback(@NonNull android.net.ConnectivityManager.OnTetheringEventCallback);

    field public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC = "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";

    field public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = "android.net.extra.CAPTIVE_PORTAL_USER_AGENT";

    field public static final int PROFILE_NETWORK_PREFERENCE_DEFAULT = 0; // 0x0

    field public static final int PROFILE_NETWORK_PREFERENCE_ENTERPRISE = 1; // 0x1

    field public static final int TETHERING_BLUETOOTH = 2; // 0x2

    field public static final int TETHERING_USB = 1; // 0x1

    field public static final int TETHERING_WIFI = 0; // 0x0

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ public class ConnectivityManager { 
     * Specify that the traffic for this user should by follow the default rules.

     * @hide

     */

    @SystemApi

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int PROFILE_NETWORK_PREFERENCE_DEFAULT = 0;



    /**
@@ -985,7 +985,7 @@ public class ConnectivityManager { 
     * if no such network is available.

     * @hide

     */

    @SystemApi

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int PROFILE_NETWORK_PREFERENCE_ENTERPRISE = 1;



    /** @hide */