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

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

Merge "Add Settings key for UWB State" into sc-qpr1-dev

parents 24a2c97b 4e18e03e

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -11844,6 +11844,13 @@ public final class Settings { 
        @Readable

        public static final String WIFI_MIGRATION_COMPLETED = "wifi_migration_completed";













        /**













         * Whether UWB should be enabled.













         * @hide













         */













        @Readable













        public static final String UWB_ENABLED = "uwb_enabled";



























        /**















         * Value to specify whether network quality scores and badging should be shown in the UI.















         *

































core/proto/android/providers/settings/global.proto



+2
−1




























Original line number
Diff line number
Diff line








@@ -972,6 +972,7 @@ message GlobalSettingsProto {













    optional SettingProto usb_mass_storage_enabled = 127 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto use_google_mail = 128 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto use_open_wifi_package = 129 [ (android.privacy).dest = DEST_AUTOMATIC ];













    optional SettingProto uwb_enabled = 155 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto vt_ims_enabled = 130 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto wait_for_debugger = 131 [ (android.privacy).dest = DEST_AUTOMATIC ];


























@@ -1065,5 +1066,5 @@ message GlobalSettingsProto {





























    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 155;













    // Next tag = 156;















}
























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



+3
−0




























Original line number
Diff line number
Diff line








@@ -1475,6 +1475,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.USE_OPEN_WIFI_PACKAGE,















                GlobalSettingsProto.USE_OPEN_WIFI_PACKAGE);













        dumpSetting(s, p,













                Settings.Global.UWB_ENABLED,













                GlobalSettingsProto.UWB_ENABLED);















        dumpSetting(s, p,















                Settings.Global.VT_IMS_ENABLED,















                GlobalSettingsProto.VT_IMS_ENABLED);

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -518,6 +518,7 @@ public class SettingsBackupTest {













                    Settings.Global.UPDATABLE_DRIVER_PRODUCTION_DENYLIST,















                    Settings.Global.UPDATABLE_DRIVER_PRODUCTION_ALLOWLIST,















                    Settings.Global.UPDATABLE_DRIVER_SPHAL_LIBRARIES,













                    Settings.Global.UWB_ENABLED,















                    Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX,















                    Settings.Global.GPU_DEBUG_LAYER_APP,















                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,