commit da6fcfd8a16404705ab0a3d4ddfb1f4282c2dac0
author Baili Feng <bailif@codeaurora.org> Wed Aug 15 20:54:54 2018 +0800
committer Daniel Mentz <danielmentz@google.com> Fri Oct 19 15:59:31 2018 -0700
tree ecd753a182544ee1ebb1a471a24934edefd945d7
parent 624cbda90497e1869ff58ab823cc1ca46061aa3e

Filter DataItems with suitable way.

We should carefully modify unordered_set when traversing it.
Update the iterator with the return value of erase function.

(cherry picked from commit 7e67a69c3afb01995be46ed45d3f328f0154f81c)
Bug: 117118677
CRs-Fixed: 2288358
Change-Id: Icd4664bf479f1d37b61dae0f9d793777d88a00d0

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++;
                     }
                 }