Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add persistent state for Hearing Aid Profile"

Browse Source
This commit is contained in:
Jakub Pawlowski
2017-11-28 17:21:10 +00:00
committed by Gerrit Code Review
parent 419ec05284 cb6ce25529
commit 2282e2f57f
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/provider/Settings.java
View File

@@ -9224,6 +9224,9 @@ public final class Settings {
/** {@hide} */ /** {@hide} */
public static final String public static final String
BLUETOOTH_PAN_PRIORITY_PREFIX = "bluetooth_pan_priority_"; BLUETOOTH_PAN_PRIORITY_PREFIX = "bluetooth_pan_priority_";
/** {@hide} */
public static final String
BLUETOOTH_HEARING_AID_PRIORITY_PREFIX = "bluetooth_hearing_aid_priority_";
/** /**
* Activity manager specific settings. * Activity manager specific settings.
@@ -9544,6 +9547,14 @@ public final class Settings {
return BLUETOOTH_PAN_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT); return BLUETOOTH_PAN_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
} }
/**
* Get the key that retrieves a bluetooth hearing aid priority.
* @hide
*/
public static final String getBluetoothHearingAidPriorityKey(String address) {
return BLUETOOTH_HEARING_AID_PRIORITY_PREFIX + address.toUpperCase(Locale.ROOT);
}
/** /**
* Get the key that retrieves a bluetooth map priority. * Get the key that retrieves a bluetooth map priority.
* @hide * @hide

1
core/proto/android/providers/settings.proto
View File

@@ -254,6 +254,7 @@ message GlobalSettingsProto {
SettingProto bluetooth_pbap_client_priority_prefix = 209; SettingProto bluetooth_pbap_client_priority_prefix = 209;
SettingProto bluetooth_sap_priority_prefix = 210; SettingProto bluetooth_sap_priority_prefix = 210;
SettingProto bluetooth_pan_priority_prefix = 211; SettingProto bluetooth_pan_priority_prefix = 211;
SettingProto bluetooth_hearing_aid_priority_prefix = 345;
SettingProto device_idle_constants = 212; SettingProto device_idle_constants = 212;
SettingProto device_idle_constants_watch = 213; SettingProto device_idle_constants_watch = 213;
SettingProto app_idle_constants = 214; SettingProto app_idle_constants = 214;

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -121,6 +121,7 @@ public class SettingsBackupTest {
Settings.Global.BLUETOOTH_PAN_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_PAN_PRIORITY_PREFIX,
Settings.Global.BLUETOOTH_PBAP_CLIENT_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_PBAP_CLIENT_PRIORITY_PREFIX,
Settings.Global.BLUETOOTH_SAP_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_SAP_PRIORITY_PREFIX,
Settings.Global.BLUETOOTH_HEARING_AID_PRIORITY_PREFIX,
Settings.Global.BOOT_COUNT, Settings.Global.BOOT_COUNT,
Settings.Global.CAPTIVE_PORTAL_FALLBACK_URL, Settings.Global.CAPTIVE_PORTAL_FALLBACK_URL,
Settings.Global.CAPTIVE_PORTAL_HTTPS_URL, Settings.Global.CAPTIVE_PORTAL_HTTPS_URL,

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -719,6 +719,9 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p, dumpSetting(s, p,
Settings.Global.BLUETOOTH_PAN_PRIORITY_PREFIX, Settings.Global.BLUETOOTH_PAN_PRIORITY_PREFIX,
GlobalSettingsProto.BLUETOOTH_PAN_PRIORITY_PREFIX); GlobalSettingsProto.BLUETOOTH_PAN_PRIORITY_PREFIX);
dumpSetting(s, p,
Settings.Global.BLUETOOTH_HEARING_AID_PRIORITY_PREFIX,
GlobalSettingsProto.BLUETOOTH_HEARING_AID_PRIORITY_PREFIX);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Global.DEVICE_IDLE_CONSTANTS, Settings.Global.DEVICE_IDLE_CONSTANTS,
GlobalSettingsProto.DEVICE_IDLE_CONSTANTS); GlobalSettingsProto.DEVICE_IDLE_CONSTANTS);