Merge "Add SystemApi getter to bluetooth constant" (c63b02af) · Commits · e / os / android_frameworks_base

core/api/module-lib-current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -555,6 +555,26 @@ package android.provider {
		field public static final String NAMESPACE_DEVICE_IDLE = "device_idle";
		}

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		field public static final String BLE_SCAN_ALWAYS_AVAILABLE = "ble_scan_always_enabled";
		field public static final String BLE_SCAN_BACKGROUND_MODE = "ble_scan_background_mode";
		field public static final String BLE_SCAN_BALANCED_INTERVAL_MS = "ble_scan_balanced_interval_ms";
		field public static final String BLE_SCAN_BALANCED_WINDOW_MS = "ble_scan_balanced_window_ms";
		field public static final String BLE_SCAN_LOW_LATENCY_INTERVAL_MS = "ble_scan_low_latency_interval_ms";
		field public static final String BLE_SCAN_LOW_LATENCY_WINDOW_MS = "ble_scan_low_latency_window_ms";
		field public static final String BLE_SCAN_LOW_POWER_INTERVAL_MS = "ble_scan_low_power_interval_ms";
		field public static final String BLE_SCAN_LOW_POWER_WINDOW_MS = "ble_scan_low_power_window_ms";
		field public static final String BLUETOOTH_BTSNOOP_DEFAULT_MODE = "bluetooth_btsnoop_default_mode";
		field public static final String BLUETOOTH_CLASS_OF_DEVICE = "bluetooth_class_of_device";
		field public static final String BLUETOOTH_DISABLED_PROFILES = "bluetooth_disabled_profiles";
		}

		public static final class Settings.Secure extends android.provider.Settings.NameValueTable {
		field public static final String BLUETOOTH_ADDRESS = "bluetooth_address";
		field public static final String BLUETOOTH_ADDR_VALID = "bluetooth_addr_valid";
		field public static final String BLUETOOTH_NAME = "bluetooth_name";
		}

		}

		package android.telephony {

core/java/android/provider/Settings.java

+28 −0

Original line number	Diff line number	Diff line
		@@ -6574,6 +6574,8 @@ public final class Settings {
		* @hide
		*/
		@Readable(maxTargetSdk = Build.VERSION_CODES.S)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLUETOOTH_NAME = "bluetooth_name";

		/**
		@@ -6581,6 +6583,8 @@ public final class Settings {
		* @hide
		*/
		@Readable(maxTargetSdk = Build.VERSION_CODES.S)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLUETOOTH_ADDRESS = "bluetooth_address";

		/**
		@@ -6588,6 +6592,8 @@ public final class Settings {
		* @hide
		*/
		@Readable(maxTargetSdk = Build.VERSION_CODES.S)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLUETOOTH_ADDR_VALID = "bluetooth_addr_valid";

		/**
		@@ -10833,6 +10839,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLUETOOTH_CLASS_OF_DEVICE = "bluetooth_class_of_device";

		/**
		@@ -10841,6 +10849,8 @@ public final class Settings {
		* {@hide}
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLUETOOTH_DISABLED_PROFILES = "bluetooth_disabled_profiles";

		/**
		@@ -12378,6 +12388,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_ALWAYS_AVAILABLE = "ble_scan_always_enabled";

		/**
		@@ -12385,6 +12397,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_LOW_POWER_WINDOW_MS = "ble_scan_low_power_window_ms";

		/**
		@@ -12392,6 +12406,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_BALANCED_WINDOW_MS = "ble_scan_balanced_window_ms";

		/**
		@@ -12399,6 +12415,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_LOW_LATENCY_WINDOW_MS =
		"ble_scan_low_latency_window_ms";

		@@ -12407,6 +12425,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_LOW_POWER_INTERVAL_MS =
		"ble_scan_low_power_interval_ms";

		@@ -12415,6 +12435,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_BALANCED_INTERVAL_MS =
		"ble_scan_balanced_interval_ms";

		@@ -12423,6 +12445,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_LOW_LATENCY_INTERVAL_MS =
		"ble_scan_low_latency_interval_ms";

		@@ -12431,6 +12455,8 @@ public final class Settings {
		* @hide
		*/
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String BLE_SCAN_BACKGROUND_MODE = "ble_scan_background_mode";

		/**
		@@ -13163,6 +13189,8 @@ public final class Settings {

		/** {@hide} */
		@Readable
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SuppressLint("NoSettingsProvider")
		public static final String
		BLUETOOTH_BTSNOOP_DEFAULT_MODE = "bluetooth_btsnoop_default_mode";
		/** {@hide} */