From ab3e7bdd62ec2707ed0bc6447f68b8f7f6012d0f Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Fri, 6 Apr 2018 10:23:28 -0700 Subject: [PATCH] Add setting for GNSS location request update duration Bug: 77696830 Test: atest SettingsBackupTest Change-Id: I4514070ba12de2d1c4c47c03a9bf70d8f57fe197 --- core/java/android/provider/Settings.java | 12 ++++++++++++ core/proto/android/providers/settings/global.proto | 1 + .../src/android/provider/SettingsBackupTest.java | 1 + .../providers/settings/SettingsProtoDumpUtil.java | 3 +++ 4 files changed, 17 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b2a2c60206397..141c651d9f3ff 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12554,6 +12554,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"; } /** diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 05686a06f9cb6..0765faae9e8e0 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -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; diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index b1936b959816f..7b6990795eec6 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -239,6 +239,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, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 67053d881dd8a..494d7a6f03c12 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -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);