diff options
| author | Joy Babafemi <jbabs@google.com> | 2021-08-31 21:11:35 +0000 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2021-09-02 17:27:03 +0000 |
| commit | 4e18e03e2299f42b5013d63a1a25db3853ee9010 (patch) | |
| tree | 83b4fb5b0a71c1d361fa4be44fef9b2f3836928b | |
| parent | a2276a43e3871775a6a4be9e416023239f1267ba (diff) | |
Add Settings key for UWB State
Test: Manual
Bug: 191608501
Change-Id: I7656f78f47183e9e61d98a3ccbac94690570df20
Merged-In: I7656f78f47183e9e61d98a3ccbac94690570df20
(cherry picked from commit 760255d89420efb2b948e26cd61535a7b9561c4a)
4 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 18e9e01bcf67..88c3d58ec845 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11845,6 +11845,13 @@ public final class Settings { 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. * * Type: int (0 for false, 1 for true) diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 6bc00e2281ef..83e26f66fd62 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -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; } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 20735cba44a3..4ac19386db0a 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1476,6 +1476,9 @@ class SettingsProtoDumpUtil { 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); dumpSetting(s, p, diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index cd34924ddb46..7db73c697ea7 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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, |