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

Commit 2282e2f5 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge "Add persistent state for Hearing Aid Profile"

parents 419ec052 cb6ce255

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -9224,6 +9224,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.
@@ -9544,6 +9547,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

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

    SettingProto bluetooth_sap_priority_prefix = 210;

    SettingProto bluetooth_pan_priority_prefix = 211;

    SettingProto bluetooth_hearing_aid_priority_prefix = 345;

    SettingProto device_idle_constants = 212;

    SettingProto device_idle_constants_watch = 213;

    SettingProto app_idle_constants = 214;

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

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,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
@@ -719,6 +719,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.DEVICE_IDLE_CONSTANTS,

                GlobalSettingsProto.DEVICE_IDLE_CONSTANTS);