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

am: 24218db904 Change-Id: I89d080a00fb87c73c2af1604f617706f0f60f32b
2017-01-23 17:35:11 +00:00
parent cf176500e6 24218db904
commit f15075c9f8
1 changed files with 1 additions and 0 deletions
--- 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) {