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) {