diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-07-17 18:50:18 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2014-07-18 21:28:18 -0700 |
| commit | 5dc219142a756d57355b511c8f8ab913c01710da (patch) | |
| tree | ede90f23cc7e80d6393e1cab3bff94f4ec866609 /services | |
| parent | 31380e84246844cf709ea13769679240ff2b48e6 (diff) | |
| download | frameworks_base-5dc219142a756d57355b511c8f8ab913c01710da.zip frameworks_base-5dc219142a756d57355b511c8f8ab913c01710da.tar.gz frameworks_base-5dc219142a756d57355b511c8f8ab913c01710da.tar.bz2 | |
Add new Display.STATE_DOZE_SUSPEND power state.
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayPowerController.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/display/LocalDisplayAdapter.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 654b574..a361e10 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -558,7 +558,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (mPowerRequest.screenState == DisplayPowerRequest.SCREEN_STATE_DOZE) { if (!mScreenBrightnessRampAnimator.isAnimating()) { - setScreenState(Display.STATE_DOZING); + setScreenState(Display.STATE_DOZE); } } else { setScreenState(Display.STATE_ON); diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 098537c..2bed143 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -115,8 +115,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { switch (state) { case Display.STATE_OFF: return SurfaceControl.POWER_MODE_OFF; - case Display.STATE_DOZING: + case Display.STATE_DOZE: return SurfaceControl.POWER_MODE_DOZE; + case Display.STATE_DOZE_SUSPEND: + return SurfaceControl.POWER_MODE_DOZE_SUSPEND; default: return SurfaceControl.POWER_MODE_NORMAL; } |