Merge "Add setting for GNSS location request update duration" into pi-dev am: af52d9815a (126b83de) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -12685,6 +12685,18 @@ public final class Settings {
		* @hide
		*/
		public static final String GNSS_SATELLITE_BLACKLIST = "gnss_satellite_blacklist";

		/**
		* Duration of updates in millisecond for GNSS location request from HAL to framework.
		*
		* If zero, the GNSS location request feature is disabled.
		*
		* The value is a non-negative long.
		*
		* @hide
		*/
		public static final String GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS =
		"gnss_hal_location_request_duration_millis";
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -452,6 +452,7 @@ message GlobalSettingsProto {
		// Secure#LOCATION_MODE_OFF} temporarily for all users.
		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 ];
		}
		optional Location location = 69;

+1 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,7 @@ public class SettingsBackupTest {
		Settings.Global.GLOBAL_HTTP_PROXY_HOST,
		Settings.Global.GLOBAL_HTTP_PROXY_PAC,
		Settings.Global.GLOBAL_HTTP_PROXY_PORT,
		Settings.Global.GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS,
		Settings.Global.GNSS_SATELLITE_BLACKLIST,
		Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS,
		Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,

+3 −0

Original line number	Diff line number	Diff line
		@@ -745,6 +745,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.GNSS_SATELLITE_BLACKLIST,
		GlobalSettingsProto.Location.GNSS_SATELLITE_BLACKLIST);
		dumpSetting(s, p,
		Settings.Global.GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS,
		GlobalSettingsProto.Location.GNSS_HAL_LOCATION_REQUEST_DURATION_MILLIS);
		p.end(locationToken);

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