Merge "Fix for framework reboot on connecting to TV through HDMI." am: 7585cbfd34

am: d3747baad2

* commit 'd3747baad2d90fcbc375eb53fe3ec1015f1d2aab':
  Fix for framework reboot on connecting to TV through HDMI.

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;
                     }
                 }