summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2015-09-25 18:59:19 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-25 18:59:19 +0000
commit0d3c613ecf69014b2de5254b79c77ca83c0fca04 (patch)
tree5f32d8b7d23bf6fdbaa6ef461afafb1668657174
parent82418d110f24f45fe62731206083e478a44052ea (diff)
parent569af4e9f8927426bb3da2c6f2c13215c05592ea (diff)
am 569af4e9: am 1727a8e0: am 31519f63: am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
* commit '569af4e9f8927426bb3da2c6f2c13215c05592ea': Do not issue config change command when not needed
-rw-r--r--services/core/java/com/android/server/display/LocalDisplayAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index be37f524eb8d..088d96e4a6e0 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -544,7 +544,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
physIndex = findDisplayInfoIndexLocked(colorTransformId, modeId);
}
}
- if (physIndex > 0 && mActivePhysIndex == physIndex) {
+ if (mActivePhysIndex == physIndex) {
return;
}
SurfaceControl.setActiveConfig(getDisplayTokenLocked(), physIndex);