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

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

Merge "Add new key from Settings.java to settings.proto." into pi-dev

parents 8b881b29 7a0493ec

core/proto/android/providers/settings.proto

+2 −1
Original line number Diff line number Diff line
@@ -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 {

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

+3 −0
Original line number Diff line number Diff line
@@ -577,6 +577,9 @@ class SettingsProtoDumpUtil { 
        dumpSetting(s, p,

                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);