From c21891284b31b1372ee48b2f588850a5c482389e Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 4 Sep 2017 15:39:50 +0000 Subject: [PATCH] AOD Policy: Fix pausing timeout to use minutes instead of seconds Bug: 65010918 Change-Id: I2a5f3a2109a38d7093fd0ea84fbb1026eb6c1215 Test: On AOD cover prox for 10s. Verify screen turns off. --- .../com/android/systemui/doze/AlwaysOnDisplayPolicy.java | 6 +++--- .../android/systemui/doze/AlwaysOnDisplayPolicyTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java b/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java index d1d180819eef9..5c99961e832c0 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/doze/AlwaysOnDisplayPolicy.java @@ -98,11 +98,11 @@ public class AlwaysOnDisplayPolicy { } proxScreenOffDelayMs = mParser.getLong(KEY_PROX_SCREEN_OFF_DELAY_MS, - 10 * DateUtils.MINUTE_IN_MILLIS); + 10 * DateUtils.SECOND_IN_MILLIS); proxCooldownTriggerMs = mParser.getLong(KEY_PROX_COOLDOWN_TRIGGER_MS, - 2 * DateUtils.MINUTE_IN_MILLIS); + 2 * DateUtils.SECOND_IN_MILLIS); proxCooldownPeriodMs = mParser.getLong(KEY_PROX_COOLDOWN_PERIOD_MS, - 5 * DateUtils.MINUTE_IN_MILLIS); + 5 * DateUtils.SECOND_IN_MILLIS); screenBrightnessArray = parseIntArray(KEY_SCREEN_BRIGHTNESS_ARRAY, resources.getIntArray(R.array.config_doze_brightness_sensor_to_brightness)); dimmingScrimArray = parseIntArray(KEY_DIMMING_SCRIM_ARRAY, diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/AlwaysOnDisplayPolicyTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/AlwaysOnDisplayPolicyTest.java index abc2d0e5c8453..0bbdeb5372487 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/AlwaysOnDisplayPolicyTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/AlwaysOnDisplayPolicyTest.java @@ -61,9 +61,9 @@ public class AlwaysOnDisplayPolicyTest extends SysuiTestCase { AlwaysOnDisplayPolicy policy = new AlwaysOnDisplayPolicy(mContext); - assertThat(policy.proxScreenOffDelayMs).isEqualTo(10 * DateUtils.MINUTE_IN_MILLIS); - assertThat(policy.proxCooldownTriggerMs).isEqualTo(2 * DateUtils.MINUTE_IN_MILLIS); - assertThat(policy.proxCooldownPeriodMs).isEqualTo(5 * DateUtils.MINUTE_IN_MILLIS); + assertThat(policy.proxScreenOffDelayMs).isEqualTo(10 * DateUtils.SECOND_IN_MILLIS); + assertThat(policy.proxCooldownTriggerMs).isEqualTo(2 * DateUtils.SECOND_IN_MILLIS); + assertThat(policy.proxCooldownPeriodMs).isEqualTo(5 * DateUtils.SECOND_IN_MILLIS); assertThat(policy.screenBrightnessArray).isEqualTo(mContext.getResources().getIntArray( R.array.config_doze_brightness_sensor_to_brightness)); assertThat(policy.dimmingScrimArray).isEqualTo(mContext.getResources().getIntArray(