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

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

Merge "Add whitelist setting to proto dump util"

parents e19f2cf1 1d905d90

core/proto/android/providers/settings/global.proto

+2 −0
Original line number Diff line number Diff line
@@ -522,6 +522,8 @@ message GlobalSettingsProto { 
        optional SettingProto global_kill_switch = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto gnss_satellite_blacklist = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];

        optional SettingProto gnss_hal_location_request_duration_millis = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];

        // Packages that are whitelisted for ignoring location settings (during emergencies)

        optional SettingProto ignore_settings_package_whitelist = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];

    }

    optional Location location = 69;

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

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

                Settings.Global.GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS,

                GlobalSettingsProto.Location.GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS);

        dumpSetting(s, p,

                Settings.Global.LOCATION_IGNORE_SETTINGS_PACKAGE_WHITELIST,

                GlobalSettingsProto.Location.IGNORE_SETTINGS_PACKAGE_WHITELIST);

        p.end(locationToken);



        final long lpmToken = p.start(GlobalSettingsProto.LOW_POWER_MODE);