summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jon Spivack <spivack@google.com> 2019-11-19 18:04:06 -0800
committer android-build-merger <android-build-merger@google.com> 2019-11-19 18:04:06 -0800
commit5c4f6504a116d56d29c887da7b29e079cf8edbd8 (patch)
tree181a6d7591aa40111d6a1460de74c2b46de39b7d
parent3943411c5de8964d4805345c7d9c01b456be157f (diff)
parent73f4c61cebeb80395cc123c1c8854a3a7a6210ad (diff)
Merge "Fix iterator in ServiceManager::removeCallback"
am: 73f4c61ceb Change-Id: Ief4d84c9bdd9227642af7d295b6798642fd7533c
-rw-r--r--cmds/servicemanager/ServiceManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
index 2d2af3c716..141171bf68 100644
--- a/cmds/servicemanager/ServiceManager.cpp
+++ b/cmds/servicemanager/ServiceManager.cpp
@@ -314,7 +314,7 @@ void ServiceManager::removeCallback(const wp<IBinder>& who,
if (listeners.empty()) {
*it = mNameToCallback.erase(*it);
} else {
- it++;
+ (*it)++;
}
}