diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2017-10-07 00:48:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-07 00:48:35 +0000 |
| commit | b5877b3e0c19d40fc50eb55bfa4ac5b6aa55795a (patch) | |
| tree | 3c0e32aac4da11f17dc896873f0116500440568b /core/java/android | |
| parent | 7fd2194b33607af33c07cc1beb492a425e6f25d6 (diff) | |
| parent | 31c0be94efa686aa54c2668c7dce2d09165e1dfe (diff) | |
Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev am: 972446cf03
am: 31c0be94ef
Change-Id: I4fca12fbda920b77ae6309e98d5f764ea878b5ce
Diffstat (limited to 'core/java/android')
| -rwxr-xr-x | core/java/android/provider/Settings.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index eca2fcdae529..c9a7ea953db4 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9404,9 +9404,12 @@ public final class Settings { /** * Battery anomaly detection specific settings - * This is encoded as a key=value list, separated by commas. Ex: + * This is encoded as a key=value list, separated by commas. + * wakeup_blacklisted_tags is a string, encoded as a set of tags, encoded via + * {@link Uri#encode(String)}, separated by colons. Ex: * - * "anomaly_detection_enabled=true,wakelock_threshold=2000" + * "anomaly_detection_enabled=true,wakelock_threshold=2000,wakeup_alarm_enabled=true," + * "wakeup_alarm_threshold=10,wakeup_blacklisted_tags=tag1:tag2:with%2Ccomma:with%3Acolon" * * The following keys are supported: * @@ -9414,6 +9417,11 @@ public final class Settings { * anomaly_detection_enabled (boolean) * wakelock_enabled (boolean) * wakelock_threshold (long) + * wakeup_alarm_enabled (boolean) + * wakeup_alarm_threshold (long) + * wakeup_blacklisted_tags (string) + * bluetooth_scan_enabled (boolean) + * bluetooth_scan_threshold (long) * </pre> * @hide */ |