commit 40e1ec18fffb1450ea90569e3288dfb113a46687
author Adam Seaton <aseaton@google.com> Fri Jan 11 22:55:15 2019 +0000
committer Adam Seaton <aseaton@google.com> Fri Jan 11 22:55:15 2019 +0000
tree 17c5a1647ecd64fc44abb3f17bbd3677c50a8af2
parent 82dae66a6aba752ff23a8c01a1cccbc22b9ee173
parent bf5f5f32d2d8c7395bb574c03e75ece441cd52d9

January Pi-platform-release merges

Change-Id: Ie428645850e95ab4b12e0be8530f52f21f850860

sdm845/core/SystemStatusOsObserver.cpp

diff --git a/sdm845/core/SystemStatusOsObserver.cpp b/sdm845/core/SystemStatusOsObserver.cpp
index 0f6d228..8127e86 100644
--- a/sdm845/core/SystemStatusOsObserver.cpp
+++ b/sdm845/core/SystemStatusOsObserver.cpp
@@ -328,9 +328,12 @@
             for (auto client : clientSet) {
                 unordered_set<DataItemId> dataItemIdsForThisClient(
                         mParent->mClientToDataItems.getValSet(client));
-                for (auto id : dataItemIdsForThisClient) {
-                    if (dataItemIdsToBeSent.find(id) == dataItemIdsToBeSent.end()) {
-                        dataItemIdsForThisClient.erase(id);
+                for (auto itr = dataItemIdsForThisClient.begin();
+                        itr != dataItemIdsForThisClient.end(); ) {
+                    if (dataItemIdsToBeSent.find(*itr) == dataItemIdsToBeSent.end()) {
+                        itr = dataItemIdsForThisClient.erase(itr);
+                    } else {
+                        itr++;
                     }
                 }