Merge "LocalDisplayAdapter: don't crash when no color modes available" am: 24218db904 am: f15075c9f8

am: d0fff5284f Change-Id: I319f88d1d88ff9e4b8507224ca7209eb7631dc99
2017-01-23 17:55:03 +00:00
parent 308bcec713 d0fff5284f
commit c0f87db026
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) {