From f99a2b6e75bc00c9351ba8157f49eac5abe1dcff Mon Sep 17 00:00:00 2001 From: Shasidhar Ganiga Date: Tue, 12 Jan 2016 11:09:27 +0530 Subject: [PATCH] Fix for framework reboot on connecting to TV through HDMI. In LocalDisplayAdapter there is a code flow possibility for activeColorTransform to be null, when colorTransforms are not supported by HAL. The Fix covers this code flow path to ensure no NullPointerException. Change-Id: I50e1058db9ee35004551bc633ad72b9a2320b428 Issue-Id: http://code.google.com/p/android/issues/detail?id=198685 Signed-off-by: Shasidhar Ganiga (cherry picked from commit 8f169e26e3a5c601ed4164639d55aa9e80c365dd) --- .../java/com/android/server/display/LocalDisplayAdapter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 088d96e4a6e09..8d66f9c848a5a 100644 --- 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; } }