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

Merge "Add key HEARING_AID_RINGTONE_ROUTING, HEARING_AID_CALL_ROUTING, HEARING_AID_MEDIA_ROUTING, HEARING_AID_SYSTEM_SOUNDS_ROUTING"

Browse Source
This commit is contained in:
Jason Hsu
2023-02-10 14:11:49 +00:00
committed by Android (Google) Code Review
parent e45dfa1269 01b6f815b8
commit 4361d63a37
5 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6999,6 +6999,58 @@ public final class Settings {
public static final String BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME =
"bluetooth_le_broadcast_app_source_name";
/**
* Ringtone routing value for hearing aid. It routes ringtone to hearing aid or device
* speaker.
* <ul>
* <li> 0 = Default
* <li> 1 = Route to hearing aid
* <li> 2 = Route to device speaker
* </ul>
* @hide
*/
public static final String HEARING_AID_RINGTONE_ROUTING =
"hearing_aid_ringtone_routing";
/**
* Phone call routing value for hearing aid. It routes phone call to hearing aid or
* device speaker.
* <ul>
* <li> 0 = Default
* <li> 1 = Route to hearing aid
* <li> 2 = Route to device speaker
* </ul>
* @hide
*/
public static final String HEARING_AID_CALL_ROUTING =
"hearing_aid_call_routing";
/**
* Media routing value for hearing aid. It routes media to hearing aid or device
* speaker.
* <ul>
* <li> 0 = Default
* <li> 1 = Route to hearing aid
* <li> 2 = Route to device speaker
* </ul>
* @hide
*/
public static final String HEARING_AID_MEDIA_ROUTING =
"hearing_aid_media_routing";
/**
* System sounds routing value for hearing aid. It routes system sounds to hearing aid
* or device speaker.
* <ul>
* <li> 0 = Default
* <li> 1 = Route to hearing aid
* <li> 2 = Route to device speaker
* </ul>
* @hide
*/
public static final String HEARING_AID_SYSTEM_SOUNDS_ROUTING =
"hearing_aid_system_sounds_routing";
/**
* Setting to indicate that on device captions are enabled.
*

4
core/proto/android/providers/settings/secure.proto
View File

@@ -90,6 +90,10 @@ message SecureSettingsProto {
optional SettingProto accessibility_magnification_follow_typing_enabled = 43 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto contrast_level = 44 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto accessibility_magnification_always_on_enabled = 45 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto hearing_aid_ringtone_routing = 46 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto hearing_aid_call_routing = 47 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto hearing_aid_media_routing = 48 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto hearing_aid_system_sounds_routing = 49 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Accessibility accessibility = 2;

6
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@@ -230,6 +230,10 @@ public class SecureSettings {
Settings.Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME,
Settings.Secure.CUSTOM_BUGREPORT_HANDLER_APP,
Settings.Secure.CUSTOM_BUGREPORT_HANDLER_USER,
Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED
Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED,
Settings.Secure.HEARING_AID_RINGTONE_ROUTING,
Settings.Secure.HEARING_AID_CALL_ROUTING,
Settings.Secure.HEARING_AID_MEDIA_ROUTING,
Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
};
}

8
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@@ -363,5 +363,13 @@ public class SecureSettingsValidators {
VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_APP, ANY_STRING_VALIDATOR);
VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_USER, ANY_INTEGER_VALIDATOR);
VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.HEARING_AID_RINGTONE_ROUTING,
new DiscreteValueValidator(new String[] {"0", "1", "2"}));
VALIDATORS.put(Secure.HEARING_AID_CALL_ROUTING,
new DiscreteValueValidator(new String[] {"0", "1", "2"}));
VALIDATORS.put(Secure.HEARING_AID_MEDIA_ROUTING,
new DiscreteValueValidator(new String[] {"0", "1", "2"}));
VALIDATORS.put(Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
new DiscreteValueValidator(new String[] {"0", "1", "2"}));
}
}

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

@@ -1836,6 +1836,18 @@ class SettingsProtoDumpUtil {
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,
SecureSettingsProto.Accessibility
.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED);
dumpSetting(s, p,
Settings.Secure.HEARING_AID_RINGTONE_ROUTING,
SecureSettingsProto.Accessibility.HEARING_AID_RINGTONE_ROUTING);
dumpSetting(s, p,
Settings.Secure.HEARING_AID_CALL_ROUTING,
SecureSettingsProto.Accessibility.HEARING_AID_CALL_ROUTING);
dumpSetting(s, p,
Settings.Secure.HEARING_AID_MEDIA_ROUTING,
SecureSettingsProto.Accessibility.HEARING_AID_MEDIA_ROUTING);
dumpSetting(s, p,
Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
SecureSettingsProto.Accessibility.HEARING_AID_SYSTEM_SOUNDS_ROUTING);
p.end(accessibilityToken);
final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);