summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorKweku Adams <kwekua@google.com>2020-08-24 10:13:15 -0700
committerKweku Adams <kwekua@google.com>2020-09-01 14:22:25 -0700
commit1e55861ed47de9be04537c6df64f2dbf4ef868cd (patch)
treed4cda15d90eef678d4e9be83bd8c5b658650ee71 /core/java/android
parente14fbaad442c700763e696e7987fb082ba0bddd2 (diff)
Migrate Doze flags to DeviceConfig.
This migrates flags inside DeviceIdleController to DeviceConfig. DeviceConfig is the recommended way and using it means that we only operate/parse the set of flags that changed instead of every single flag whenever one of them changes. Bug: 124466289 Test: atest CtsHostsideNetworkTests Test: atest FrameworksMockingServicesTests:DeviceIdleControllerTest Test: atest SettingsProviderTest:SettingsBackupTest Change-Id: I7fff451b641eee43a13e77df7b40db5b3af16d58
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/DeviceConfig.java9
-rw-r--r--core/java/android/provider/Settings.java32
2 files changed, 9 insertions, 32 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 859b70382328..7a03953f2e9b 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -145,6 +145,15 @@ public final class DeviceConfig {
public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";
/**
+ * Namespace for device idle configurations.
+ *
+ * @hide
+ */
+ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
+ @TestApi
+ public static final String NAMESPACE_DEVICE_IDLE = "device_idle";
+
+ /**
* Namespace for how dex runs. The feature requires a reboot to reach a clean state.
*
* @deprecated No longer used
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 03cf0cf2ca78..739e169e44c7 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -11534,38 +11534,6 @@ public final class Settings {
public static final String APP_OPS_CONSTANTS = "app_ops_constants";
/**
- * Device Idle (Doze) specific settings.
- * This is encoded as a key=value list, separated by commas. Ex:
- *
- * "inactive_to=60000,sensing_to=400000"
- *
- * The following keys are supported:
- *
- * <pre>
- * inactive_to (long)
- * sensing_to (long)
- * motion_inactive_to (long)
- * idle_after_inactive_to (long)
- * idle_pending_to (long)
- * max_idle_pending_to (long)
- * idle_pending_factor (float)
- * quick_doze_delay_to (long)
- * idle_to (long)
- * max_idle_to (long)
- * idle_factor (float)
- * min_time_to_alarm (long)
- * max_temp_app_whitelist_duration (long)
- * notification_whitelist_duration (long)
- * </pre>
- *
- * <p>
- * Type: string
- * @hide
- * @see com.android.server.DeviceIdleController.Constants
- */
- public static final String DEVICE_IDLE_CONSTANTS = "device_idle_constants";
-
- /**
* Battery Saver specific settings
* This is encoded as a key=value list, separated by commas. Ex:
*