From 1a49a8ab3900ab77209b1c5b34a33cc3a8be3e2c Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Tue, 12 Sep 2017 15:59:52 -0700 Subject: [PATCH] Turn on wakeupAlarm anomaly detector In ag/2642771, wakeup alarms is changed to based on screen-off timebase. After that, all the wakeup alarms will be background ones. So it is safe to turn on the wakeupAlarm anomaly detector. Bug: 65597330 Test: RunSettingsRoboTests Change-Id: I653d4bbfa671c52890dc6c6b13870c666ba9b944 --- .../android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java | 2 +- .../settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java index 0c401b500f..4829ca01d3 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java @@ -122,7 +122,7 @@ public class AnomalyDetectionPolicy { anomalyDetectionEnabled = mParserWrapper.getBoolean(KEY_ANOMALY_DETECTION_ENABLED, true); wakeLockDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKELOCK_DETECTION_ENABLED, true); wakeupAlarmDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED, - false); + true); bluetoothScanDetectionEnabled = mParserWrapper.getBoolean( KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true); wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD, diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java index 914cc2f514..169cba8e9b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java @@ -84,7 +84,7 @@ public class AnomalyDetectionPolicyTest { assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue(); assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isTrue(); assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(DateUtils.HOUR_IN_MILLIS); - assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isFalse(); + assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isTrue(); assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(60); assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue(); assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo( @@ -112,7 +112,7 @@ public class AnomalyDetectionPolicyTest { doReturn(false).when(mKeyValueListParserWrapper).getBoolean( AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, true); doReturn(true).when(mKeyValueListParserWrapper).getBoolean( - AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false); + AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, true); doReturn(true).when(mKeyValueListParserWrapper).getBoolean( AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true); -- 2.11.0