Merge "Fix iterator in ServiceManager::removeCallback" am: 73f4c61ceb am: 5c4f6504a1

am: ff9c02ac82

Change-Id: Id8b89b12243fcadbdb8965eb310569913108e381

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