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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-03 18:59:59 +00:00
committed by Android (Google) Code Review
parent 24a2c97ba5 4e18e03e22
commit d9a873a20e
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11844,6 +11844,13 @@ public final class Settings {
@Readable @Readable
public static final String WIFI_MIGRATION_COMPLETED = "wifi_migration_completed"; 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. * Value to specify whether network quality scores and badging should be shown in the UI.
* *

3
core/proto/android/providers/settings/global.proto
View File

@@ -972,6 +972,7 @@ message GlobalSettingsProto {
optional SettingProto usb_mass_storage_enabled = 127 [ (android.privacy).dest = DEST_AUTOMATIC ]; 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_google_mail = 128 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto use_open_wifi_package = 129 [ (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 vt_ims_enabled = 130 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto wait_for_debugger = 131 [ (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 // Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit). // if possible (to avoid reaching the method limit).
// Next tag = 155; // Next tag = 156;
} }

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

@@ -1475,6 +1475,9 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p, dumpSetting(s, p,
Settings.Global.USE_OPEN_WIFI_PACKAGE, Settings.Global.USE_OPEN_WIFI_PACKAGE,
GlobalSettingsProto.USE_OPEN_WIFI_PACKAGE); GlobalSettingsProto.USE_OPEN_WIFI_PACKAGE);
dumpSetting(s, p,
Settings.Global.UWB_ENABLED,
GlobalSettingsProto.UWB_ENABLED);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Global.VT_IMS_ENABLED, Settings.Global.VT_IMS_ENABLED,
GlobalSettingsProto.VT_IMS_ENABLED); GlobalSettingsProto.VT_IMS_ENABLED);

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -518,6 +518,7 @@ public class SettingsBackupTest {
Settings.Global.UPDATABLE_DRIVER_PRODUCTION_DENYLIST, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_DENYLIST,
Settings.Global.UPDATABLE_DRIVER_PRODUCTION_ALLOWLIST, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_ALLOWLIST,
Settings.Global.UPDATABLE_DRIVER_SPHAL_LIBRARIES, Settings.Global.UPDATABLE_DRIVER_SPHAL_LIBRARIES,
Settings.Global.UWB_ENABLED,
Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX, Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX,
Settings.Global.GPU_DEBUG_LAYER_APP, Settings.Global.GPU_DEBUG_LAYER_APP,
Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,