diff options
| author | 2017-01-23 17:59:12 +0000 | |
|---|---|---|
| committer | 2017-01-23 17:59:12 +0000 | |
| commit | dbb1176b4957857287801bbceef079a6562a3cdf (patch) | |
| tree | 36add6000a9e6cca4f8cd2c9a1e4564837e17048 | |
| parent | c3f3595153a5a5b2c7bbeab628e96cf711670fd4 (diff) | |
| parent | c0f87db0265f3fc2db0a356e5f5bb133d8ec9516 (diff) | |
Merge "LocalDisplayAdapter: don't crash when no color modes available" am: 24218db904 am: f15075c9f8 am: d0fff5284f
am: c0f87db026
Change-Id: I24f5c280be0107080d66ee793999e5e0e5ffe8ac
| -rw-r--r-- | services/core/java/com/android/server/display/LocalDisplayAdapter.java | 1 |
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 867322578a66..841a951923a3 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) { |