Merge "LocalDisplayAdapter: don't crash when no color modes available"

am: 24218db904

Change-Id: I89d080a00fb87c73c2af1604f617706f0f60f32b

1 files changed, 1 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 61c2eacaa8f9..58600bb553dd 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<Integer> pendingColorModes = new ArrayList<>();
 
+            if (colorModes == null) return false;
             // Build an updated list of all existing color modes.
             boolean colorModesAdded = false;
             for (int colorMode: colorModes) {