Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f98ad57 authored by jackqdyulei's avatar jackqdyulei Committed by android-build-merger
Browse files

Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev 

am: 7853f244

Change-Id: Ibf4e6c97267fa341913506d258802dc4c6d8d137
parents c8996926 7853f244

src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);