diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-01-13 12:26:07 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-02-24 13:21:11 -0800 |
| commit | c583d03388638d0670a0e7e8c749d543a16e19ab (patch) | |
| tree | 70c4e4c0c45c4ed0b0b7d0f3e3e58b65bb0b5367 /core | |
| parent | 040c3dbf982f60cd8431ccab1ba9fcb4cff39ac3 (diff) | |
| download | frameworks_base-c583d03388638d0670a0e7e8c749d543a16e19ab.zip frameworks_base-c583d03388638d0670a0e7e8c749d543a16e19ab.tar.gz frameworks_base-c583d03388638d0670a0e7e8c749d543a16e19ab.tar.bz2 | |
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386
Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 53897e0..1f9a526 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7274,10 +7274,12 @@ public final class Settings { * The following keys are supported: * * <pre> - * idle_duration (long) + * idle_duration2 (long) * wallclock_threshold (long) * parole_interval (long) * parole_duration (long) + * + * idle_duration (long) // This is deprecated and used to circumvent b/26355386. * </pre> * * <p> |