From b34c8104cbb8acc554c4039a2a283ea4d1fcc92f Mon Sep 17 00:00:00 2001 From: thecrazyskull Date: Sun, 18 Dec 2016 12:48:20 -0500 Subject: [PATCH] LocalDisplayAdapter: don't crash when no color modes available Test: none Change-Id: Ic11b5b66864fdd97b290722cba534b2aa38ac054 --- .../java/com/android/server/display/LocalDisplayAdapter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 61c2eacaa8f99..58600bb553dd8 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -285,6 +285,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { int activeColorMode) { List pendingColorModes = new ArrayList<>(); + if (colorModes == null) return false; // Build an updated list of all existing color modes. boolean colorModesAdded = false; for (int colorMode: colorModes) {