summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJoe LaPenna <jlapenna@google.com>2016-03-24 18:18:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-24 18:18:26 +0000
commit23c63dd65f304d554bc6cbf2f6016e6e9c8e4f4e (patch)
treee61494ea2110d5898671bd06bd59a6249cebc2ae /core/java/android
parentcdf90bb6747aa100305def66a7984522600d803e (diff)
parentf33b5bffeeca2ec56a9edda71d4401a9b96153c5 (diff)
Merge "Allow setting doze timeouts based on system feature" into nyc-dev
Diffstat (limited to 'core/java/android')
-rwxr-xr-xcore/java/android/provider/Settings.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d8937b41eeae..b2e479a174ca 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7699,6 +7699,16 @@ public final class Settings {
public static final String DEVICE_IDLE_CONSTANTS = "device_idle_constants";
/**
+ * Device Idle (Doze) specific settings for watches. See {@code #DEVICE_IDLE_CONSTANTS}
+ *
+ * <p>
+ * Type: string
+ * @hide
+ * @see com.android.server.DeviceIdleController.Constants
+ */
+ public static final String DEVICE_IDLE_CONSTANTS_WATCH = "device_idle_constants_watch";
+
+ /**
* App standby (app idle) specific settings.
* This is encoded as a key=value list, separated by commas. Ex:
*