| commit | 4c58cc15edc71136dab74177e1d8d1f140d652f7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 30 00:20:51 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 30 00:20:51 2019 +0000 |
| tree | bb95c4f7b32136cbc016e8fc26fe02c7123f7c00 | |
| parent | 4e5aa5d5b78088a6d7a54b248eb40ca37cefaee9 [diff] | |
| parent | 30c8d907d48758caa3901de33450398571e5eace [diff] |
Merge "SurfaceComposerClient: Fix potential null de-reference in setRelativeLayer"
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 2083a2b..c8bc527 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp
@@ -622,6 +622,7 @@ layer_state_t* s = getLayerState(sc); if (!s) { mStatus = BAD_INDEX; + return *this; } s->what |= layer_state_t::eRelativeLayerChanged; s->relativeLayerHandle = relativeTo;