commit 041e0ad6545eb8bf4a6e3cfba655baaadc4d7bda
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 01 22:15:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 01 22:15:50 2017 +0000
tree 204a19705d8d0846ba20165cf1ea0431045676d9
parent 723c48987209c93a902c29a858880b4fe340509d
parent 06d5e3590eb23144dd9de567663633160ba39302

Merge "[libadapter] Fix nullpointer in acceptchanges" into oc-dev

libs/hwc2on1adapter/HWC2On1Adapter.cpp

diff --git a/libs/hwc2on1adapter/HWC2On1Adapter.cpp b/libs/hwc2on1adapter/HWC2On1Adapter.cpp
index 03297ca..e35bfc9 100644
--- a/libs/hwc2on1adapter/HWC2On1Adapter.cpp
+++ b/libs/hwc2on1adapter/HWC2On1Adapter.cpp
@@ -538,6 +538,12 @@
     for (auto& change : mChanges->getTypeChanges()) {
         auto layerId = change.first;
         auto type = change.second;
+        if (mDevice.mLayers.count(layerId) == 0) {
+            // This should never happen but somehow does.
+            ALOGW("Cannot accept change for unknown layer (%" PRIu64 ")",
+                  layerId);
+            continue;
+        }
         auto layer = mDevice.mLayers[layerId];
         layer->setCompositionType(type);
     }