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

Commit fd959bc1 authored by Anthony Stange's avatar Anthony Stange Committed by android-build-merger
Browse files

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

am: e08a6aa8

Change-Id: Ic801aa98c7511be5e005b71bd1b37e0de687b303
parents b5eff77b e08a6aa8

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