From 3b3cbb5325e1a8bce09200644b5667fb321d9b90 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 24 Sep 2015 17:35:58 -0700
Subject: Do not issue config change command when not needed

This caused a but where WindowManager was blocked on this to perform a
layout, leading to delays in screen wake-ups.

Bug: 24383169
Change-Id: I42bc08dae9057060f09c301328bb4839a970c597
---
 services/core/java/com/android/server/display/LocalDisplayAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
cgit v1.2.3-59-g8ed1b