Merge "Add NetworkMonitor constants to SystemApi" (95b523ce) · Commits · e / os / android_frameworks_base

api/system-current.txt

+23 −0

Original line number	Diff line number	Diff line
		@@ -3024,6 +3024,12 @@ package android.metrics {

		package android.net {

		public class CaptivePortal implements android.os.Parcelable {
		field public static final int APP_RETURN_DISMISSED = 0; // 0x0
		field public static final int APP_RETURN_UNWANTED = 1; // 0x1
		field public static final int APP_RETURN_WANTED_AS_IS = 2; // 0x2
		}

		public class ConnectivityManager {
		method @RequiresPermission(android.Manifest.permission.LOCAL_MAC_ADDRESS) public String getCaptivePortalServerUrl();
		method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();
		@@ -3031,6 +3037,8 @@ package android.net {
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void stopTethering(int);
		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 TETHERING_BLUETOOTH = 2; // 0x2
		field public static final int TETHERING_USB = 1; // 0x1
		field public static final int TETHERING_WIFI = 0; // 0x0
		@@ -4236,8 +4244,23 @@ package android.provider {
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, @Nullable String, boolean);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);
		field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
		field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";
		field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";
		field public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";
		field public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";
		field public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";
		field public static final int CAPTIVE_PORTAL_MODE_AVOID = 2; // 0x2
		field public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0; // 0x0
		field public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1; // 0x1
		field public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS = "captive_portal_other_fallback_urls";
		field public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";
		field public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";
		field public static final String CARRIER_APP_NAMES = "carrier_app_names";
		field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";
		field public static final String DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD = "data_stall_consecutive_dns_timeout_threshold";
		field public static final String DATA_STALL_EVALUATION_TYPE = "data_stall_evaluation_type";
		field public static final String DATA_STALL_MIN_EVALUATE_INTERVAL = "data_stall_min_evaluate_interval";
		field public static final String DATA_STALL_VALID_DNS_TIME_THRESHOLD = "data_stall_valid_dns_time_threshold";
		field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";
		field public static final String EUICC_PROVISIONED = "euicc_provisioned";
		field public static final String INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT = "install_carrier_app_notification_persistent";

api/test-current.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -598,6 +598,17 @@ package android.media.audiofx {

		package android.net {

		public class CaptivePortal implements android.os.Parcelable {
		field public static final int APP_RETURN_DISMISSED = 0; // 0x0
		field public static final int APP_RETURN_UNWANTED = 1; // 0x1
		field public static final int APP_RETURN_WANTED_AS_IS = 2; // 0x2
		}

		public class ConnectivityManager {
		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";
		}

		public final class IpSecManager {
		field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0
		}
		@@ -912,6 +923,21 @@ package android.provider {

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
		field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";
		field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";
		field public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";
		field public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";
		field public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";
		field public static final int CAPTIVE_PORTAL_MODE_AVOID = 2; // 0x2
		field public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0; // 0x0
		field public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1; // 0x1
		field public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS = "captive_portal_other_fallback_urls";
		field public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";
		field public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";
		field public static final String DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD = "data_stall_consecutive_dns_timeout_threshold";
		field public static final String DATA_STALL_EVALUATION_TYPE = "data_stall_evaluation_type";
		field public static final String DATA_STALL_MIN_EVALUATE_INTERVAL = "data_stall_min_evaluate_interval";
		field public static final String DATA_STALL_VALID_DNS_TIME_THRESHOLD = "data_stall_valid_dns_time_threshold";
		field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";
		field public static final String LOCATION_GLOBAL_KILL_SWITCH = "location_global_kill_switch";
		field public static final String LOW_POWER_MODE = "low_power";

core/java/android/net/CaptivePortal.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package android.net;

		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.IBinder;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -28,10 +30,16 @@ import android.os.RemoteException;
		*/
		public class CaptivePortal implements Parcelable {
		/** @hide */
		@SystemApi
		@TestApi
		public static final int APP_RETURN_DISMISSED = 0;
		/** @hide */
		@SystemApi
		@TestApi
		public static final int APP_RETURN_UNWANTED = 1;
		/** @hide */
		@SystemApi
		@TestApi
		public static final int APP_RETURN_WANTED_AS_IS = 2;

		private final IBinder mBinder;

core/java/android/net/ConnectivityManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		import android.app.PendingIntent;
		import android.content.Context;
		@@ -255,6 +256,8 @@ public class ConnectivityManager {
		* portal login activity.
		* {@hide}
		*/
		@SystemApi
		@TestApi
		public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC =
		"android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";

		@@ -262,6 +265,8 @@ public class ConnectivityManager {
		* Key for passing a user agent string to the captive portal login activity.
		* {@hide}
		*/
		@SystemApi
		@TestApi
		public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT =
		"android.net.extra.CAPTIVE_PORTAL_USER_AGENT";

core/java/android/provider/Settings.java

+30 −0

Original line number	Diff line number	Diff line
		@@ -10329,6 +10329,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0;

		/**
		@@ -10337,6 +10339,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1;

		/**
		@@ -10345,6 +10349,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;

		/**
		@@ -10354,6 +10360,8 @@ public final class Settings {
		* The default for this setting is CAPTIVE_PORTAL_MODE_PROMPT.
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";

		/**
		@@ -10382,6 +10390,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";

		/**
		@@ -10390,6 +10400,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";

		/**
		@@ -10398,6 +10410,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";

		/**
		@@ -10406,6 +10420,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS =
		"captive_portal_other_fallback_urls";

		@@ -10415,6 +10431,8 @@ public final class Settings {
		* by "@@,@@".
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS =
		"captive_portal_fallback_probe_specs";

		@@ -10425,6 +10443,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";

		/**
		@@ -10433,6 +10453,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";

		/**
		@@ -10442,6 +10464,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD =
		"data_stall_consecutive_dns_timeout_threshold";

		@@ -10450,6 +10474,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String DATA_STALL_MIN_EVALUATE_INTERVAL =
		"data_stall_min_evaluate_interval";

		@@ -10459,6 +10485,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String DATA_STALL_VALID_DNS_TIME_THRESHOLD =
		"data_stall_valid_dns_time_threshold";

		@@ -10468,6 +10496,8 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String DATA_STALL_EVALUATION_TYPE = "data_stall_evaluation_type";

		/**