Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AOD: Don't use DOZE screen state on AOD2"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-28 22:10:05 +00:00
committed by Android (Google) Code Review
parent 7dda2cb65b 2324d8578a
commit 666f139f7b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
View File

@@ -91,7 +91,7 @@ public class DozeMachine {
case DOZE_AOD_PAUSED:
return Display.STATE_OFF;
case DOZE_PULSING:
return Display.STATE_DOZE;
return Display.STATE_ON;
case DOZE_AOD:
return Display.STATE_DOZE_SUSPEND;
default:

2
packages/SystemUI/src/com/android/systemui/doze/DozeService.java
View File

@@ -60,6 +60,8 @@ public class DozeService extends DreamService implements DozeMachine.Service {
super.onDreamingStarted();
mDozeMachine.requestState(DozeMachine.State.INITIALIZED);
startDozing();
setDozeScreenBrightness(getResources().getInteger(
com.android.internal.R.integer.config_screenBrightnessDoze));
}
@Override

2
packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
View File

@@ -238,7 +238,7 @@ public class DozeMachineTest {
mMachine.requestState(DOZE_REQUEST_PULSE);
mMachine.requestState(DOZE_PULSING);
assertEquals(Display.STATE_DOZE, mServiceFake.screenState);
assertEquals(Display.STATE_ON, mServiceFake.screenState);
}
@Test