diff options
| author | 2018-03-21 15:04:09 +0000 | |
|---|---|---|
| committer | 2018-03-23 11:15:37 +0000 | |
| commit | 7a0493ec2795e93eba62243b6cf5c72d2fb33c31 (patch) | |
| tree | f4a24543bbdc4d35a7fa4a9223f117bb261d1132 | |
| parent | d935bd4236538e809ec1ef237eed4ce3490fe723 (diff) | |
Add new key from Settings.java to settings.proto.
Bug: 71765044
Test: Presubmits
Change-Id: I28f19791e26a07c9bf6846bbf99c774682cdf18f
| -rw-r--r-- | core/proto/android/providers/settings.proto | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/proto/android/providers/settings.proto b/core/proto/android/providers/settings.proto index 953da1735fde..89665dbf6282 100644 --- a/core/proto/android/providers/settings.proto +++ b/core/proto/android/providers/settings.proto @@ -228,6 +228,7 @@ message GlobalSettingsProto { optional SettingProto ble_scan_low_power_interval_ms = 161 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto ble_scan_balanced_interval_ms = 162 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto ble_scan_low_latency_interval_ms = 163 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto ble_scan_background_mode = 389 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto wifi_saved_state = 164 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto wifi_supplicant_scan_interval_ms = 165 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto wifi_enhanced_auto_join = 166 [ (android.privacy).dest = DEST_AUTOMATIC ]; @@ -507,7 +508,7 @@ message GlobalSettingsProto { optional SettingsProto backup_agent_timeout_parameters = 386; // Please insert fields in the same order as in // frameworks/base/core/java/android/provider/Settings.java. - // Next tag = 389; + // Next tag = 390; } message SecureSettingsProto { diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 3467df5df6fe..2047f5873fca 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -578,6 +578,9 @@ class SettingsProtoDumpUtil { Settings.Global.BLE_SCAN_LOW_LATENCY_INTERVAL_MS, GlobalSettingsProto.BLE_SCAN_LOW_LATENCY_INTERVAL_MS); dumpSetting(s, p, + Settings.Global.BLE_SCAN_BACKGROUND_MODE, + GlobalSettingsProto.BLE_SCAN_BACKGROUND_MODE); + dumpSetting(s, p, Settings.Global.WIFI_SAVED_STATE, GlobalSettingsProto.WIFI_SAVED_STATE); dumpSetting(s, p, |