Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6a8970b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add persistent state for Hearing Aid Profile"

parents cba2b002 c2d7be66

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -9379,6 +9379,9 @@ public final class Settings { 
        /** {@hide} */

        public static final String

                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.
@@ -9744,6 +9747,14 @@ public final class Settings { 
            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.

         * @hide

core/proto/android/providers/settings.proto

+2 −1
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ message GlobalSettingsProto { 
    optional SettingProto bluetooth_pbap_client_priority_prefix = 209;

    optional SettingProto bluetooth_sap_priority_prefix = 210;

    optional SettingProto bluetooth_pan_priority_prefix = 211;

    optional SettingProto bluetooth_hearing_aid_priority_prefix = 345;

    optional SettingProto activity_manager_constants = 317;

    optional SettingProto device_idle_constants = 212;

    optional SettingProto device_idle_constants_watch = 213;
@@ -387,7 +388,7 @@ message GlobalSettingsProto { 
    optional SettingProto enable_deletion_helper_no_threshold_toggle = 340;

    optional SettingProto notification_snooze_options = 341;



    // Next tag = 345;

    // Next tag = 346;

}



message SecureSettingsProto {

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public class SettingsBackupTest { 
                    Settings.Global.BLUETOOTH_PAN_PRIORITY_PREFIX,

                    Settings.Global.BLUETOOTH_PBAP_CLIENT_PRIORITY_PREFIX,

                    Settings.Global.BLUETOOTH_SAP_PRIORITY_PREFIX,

                    Settings.Global.BLUETOOTH_HEARING_AID_PRIORITY_PREFIX,

                    Settings.Global.BOOT_COUNT,

                    Settings.Global.CAPTIVE_PORTAL_FALLBACK_URL,

                    Settings.Global.CAPTIVE_PORTAL_HTTPS_URL,

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0
Original line number Diff line number Diff line
@@ -800,6 +800,9 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                Settings.Global.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,

                Settings.Global.ACTIVITY_MANAGER_CONSTANTS,

                GlobalSettingsProto.ACTIVITY_MANAGER_CONSTANTS);