diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-06-12 23:20:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-12 23:20:28 +0000 |
| commit | cd9d7b7b076ff28bef5403b97754ae2853db17ee (patch) | |
| tree | 9d9bd5f0cb915bdbf283a24662555ad5ad5afd38 /core/java/android/provider/Settings.java | |
| parent | 1d04e6a6cd06062483e22b387c6c1a615e4e5088 (diff) | |
| parent | a6232df053cdc2df9d8a1d97a5c81d55cce7a1e2 (diff) | |
| download | frameworks_base-cd9d7b7b076ff28bef5403b97754ae2853db17ee.zip frameworks_base-cd9d7b7b076ff28bef5403b97754ae2853db17ee.tar.gz frameworks_base-cd9d7b7b076ff28bef5403b97754ae2853db17ee.tar.bz2 | |
Merge "App Standby: Convert constants to Settings.Global" into mnc-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f2d3e71..e335f6d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5551,13 +5551,6 @@ public final class Settings { public static final String SLEEP_TIMEOUT = "sleep_timeout"; /** - * Duration in milliseconds that an app should be inactive before it is considered idle. - * <p/>Type: Long - * @hide - */ - public static final String APP_IDLE_DURATION = "app_idle_duration"; - - /** * Controls whether double tap to wake is enabled. * @hide */ @@ -7117,6 +7110,28 @@ public final class Settings { public static final String DEVICE_IDLE_CONSTANTS = "device_idle_constants"; /** + * App standby (app idle) specific settings. + * This is encoded as a key=value list, separated by commas. Ex: + * + * "idle_duration=5000,parole_interval=4500" + * + * The following keys are supported: + * + * <pre> + * idle_duration (long) + * wallclock_threshold (long) + * parole_interval (long) + * parole_duration (long) + * </pre> + * + * <p> + * Type: string + * @hide + * @see com.android.server.usage.UsageStatsService.SettingsObserver + */ + public static final String APP_IDLE_CONSTANTS = "app_idle_constants"; + + /** * Get the key that retrieves a bluetooth headset's priority. * @hide */ |