diff options
| author | Michael Wachenschwanz <mwachens@google.com> | 2018-05-02 00:23:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-02 00:23:23 +0000 |
| commit | b3972f9d2351a877fc0be5841da3289d5a487ebf (patch) | |
| tree | 9dbd8506b1261b01743f2058700c3b6c215680fc /core/java | |
| parent | da8e229b9c310c2f82111764c654ff687287e02c (diff) | |
| parent | 5ca5cb6c5350d8f79beb418251cad90eb152813e (diff) | |
Merge "Add Stable Charging Threshold for AppStandby" into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9e56d1425da6..f2d4542e960a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10611,18 +10611,30 @@ public final class Settings { * App standby (app idle) specific settings. * This is encoded as a key=value list, separated by commas. Ex: * <p> - * "idle_duration=5000,parole_interval=4500" + * "idle_duration=5000,parole_interval=4500,screen_thresholds=0/0/60000/120000" * <p> * All durations are in millis. + * Array values are separated by forward slashes * The following keys are supported: * * <pre> - * idle_duration2 (long) - * wallclock_threshold (long) - * parole_interval (long) - * parole_duration (long) + * parole_interval (long) + * parole_window (long) + * parole_duration (long) + * screen_thresholds (long[4]) + * elapsed_thresholds (long[4]) + * strong_usage_duration (long) + * notification_seen_duration (long) + * system_update_usage_duration (long) + * prediction_timeout (long) + * sync_adapter_duration (long) + * exempted_sync_duration (long) + * system_interaction_duration (long) + * stable_charging_threshold (long) * * idle_duration (long) // This is deprecated and used to circumvent b/26355386. + * idle_duration2 (long) // deprecated + * wallclock_threshold (long) // deprecated * </pre> * * <p> |