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

Commit 90db9083 authored by Lei Yu's avatar Lei Yu Committed by android-build-merger
Browse files

Merge "Turn off some anomaly detectors by default" into oc-dr1-dev 

am: f940431d

Change-Id: I1d3672b40a0de6dfe481295134a5cb9eeea91b89
parents ae0dbe3e f940431d

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

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

                true);

                false);

        bluetoothScanDetectionEnabled = mParserWrapper.getBoolean(

                KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);

                KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);

        wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD,

                DateUtils.HOUR_IN_MILLIS);

        wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 60);

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

+4 −4
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ public class AnomalyDetectionPolicyTest { 
        assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isTrue();

        assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isTrue();

        assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(DateUtils.HOUR_IN_MILLIS);

        assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isTrue();

        assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isFalse();

        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(60);

        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();

        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isFalse();

        assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(

                30 * DateUtils.MINUTE_IN_MILLIS);

    }
@@ -112,9 +112,9 @@ 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, true);

                AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false);

        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(

                AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);

                AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);



        return new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);

    }