| commit | 3f8312b5dc975c391f85f90a4a0586ac3c7ac899 | [log] [tgz] |
|---|---|---|
| author | Valerie Hau <vhau@google.com> | Wed May 15 16:47:00 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 15 16:47:00 2019 +0000 |
| tree | 792204e427eb79d09122b1f3d94273ed6a52edb9 | |
| parent | 598673fc553d755cedf96feae03cbc5165f1474c [diff] | |
| parent | e5562ecb2efb43397583c1f66f5f15c994a2c0a2 [diff] |
Merge "Fix loop in SF flushTransactionQueues" into qt-dev
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 70e15c9..4d885fb 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3564,7 +3564,7 @@ it = mTransactionQueues.erase(it); mTransactionCV.broadcast(); } else { - std::next(it, 1); + it = std::next(it, 1); } } }