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

am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev

Browse Source 
* commit '3af392674969b17cd3719f49ae597c7dc6ee6614':
  Fix HDMI hotplug display blanking behavior.
This commit is contained in:
Jeff Brown
2014-04-23 01:22:26 +00:00
committed by Android Git Automerger
parent d12bf27575 3af3926749
commit 62271b9522
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -96,6 +96,14 @@ final class LocalDisplayAdapter extends DisplayAdapter {
}
}
static boolean shouldBlank(int state) {
return state == Display.STATE_OFF;
}
static boolean shouldUnblank(int state) {
return state == Display.STATE_ON || state == Display.STATE_DOZING;
}
private final class LocalDisplayDevice extends DisplayDevice {
private final int mBuiltInDisplayId;
private final SurfaceControl.PhysicalDisplayInfo mPhys;
@@ -175,9 +183,9 @@ final class LocalDisplayAdapter extends DisplayAdapter {
@Override
public void requestDisplayStateLocked(int state) {
if (mState != state) {
if (state == Display.STATE_OFF && mState != Display.STATE_OFF) {
if (shouldBlank(state) && !shouldBlank(mState)) {
SurfaceControl.blankDisplay(getDisplayTokenLocked());
} else if (state != Display.STATE_OFF && mState == Display.STATE_OFF) {
} else if (shouldUnblank(state) && !shouldUnblank(mState)) {
SurfaceControl.unblankDisplay(getDisplayTokenLocked());
}
mState = state;