Merge "Fix for framework reboot on connecting to TV through HDMI."

am: 7585cbfd34 * commit '7585cbfd34a46bc8332bf066a5d0f69677d3a7e1': Fix for framework reboot on connecting to TV through HDMI.
2016-03-02 23:57:28 +00:00
parent 86feb01288 7585cbfd34
commit d3747baad2
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -191,6 +191,9 @@ final class LocalDisplayAdapter extends DisplayAdapter {
                for (int j = 0; j < colorTransforms.size(); j++) {
                    if (colorTransforms.get(j).getColorTransform() == info.colorTransform) {
                        existingMode = true;
+                        if (i == activeDisplayInfo) {
+                            activeColorTransform = colorTransforms.get(j);
+                        }
                        break;
                    }
                }