Merge "Move constants to MODULE_LIB"
This commit is contained in:
@@ -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_OFF = "off";
|
||||||
field public static final String PRIVATE_DNS_MODE_OPPORTUNISTIC = "opportunistic";
|
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 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 {
|
public final class NetworkAgentConfig implements android.os.Parcelable {
|
||||||
|
|||||||
@@ -67,8 +67,6 @@ package android.net {
|
|||||||
method @Deprecated @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void unregisterTetheringEventCallback(@NonNull android.net.ConnectivityManager.OnTetheringEventCallback);
|
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_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 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_BLUETOOTH = 2; // 0x2
|
||||||
field public static final int TETHERING_USB = 1; // 0x1
|
field public static final int TETHERING_USB = 1; // 0x1
|
||||||
field public static final int TETHERING_WIFI = 0; // 0x0
|
field public static final int TETHERING_WIFI = 0; // 0x0
|
||||||
|
|||||||
@@ -975,7 +975,7 @@ public class ConnectivityManager {
|
|||||||
* Specify that the traffic for this user should by follow the default rules.
|
* Specify that the traffic for this user should by follow the default rules.
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
@SystemApi
|
@SystemApi(client = MODULE_LIBRARIES)
|
||||||
public static final int PROFILE_NETWORK_PREFERENCE_DEFAULT = 0;
|
public static final int PROFILE_NETWORK_PREFERENCE_DEFAULT = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -985,7 +985,7 @@ public class ConnectivityManager {
|
|||||||
* if no such network is available.
|
* if no such network is available.
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
@SystemApi
|
@SystemApi(client = MODULE_LIBRARIES)
|
||||||
public static final int PROFILE_NETWORK_PREFERENCE_ENTERPRISE = 1;
|
public static final int PROFILE_NETWORK_PREFERENCE_ENTERPRISE = 1;
|
||||||
|
|
||||||
/** @hide */
|
/** @hide */
|
||||||
|
|||||||
Reference in New Issue
Block a user