| commit | d0d28e3183d55c4a23d87b59681ceac3e3cf133d | [log] [tgz] |
|---|---|---|
| author | Jon Spivack <spivack@google.com> | Tue Nov 19 20:25:33 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 19 20:25:33 2019 -0800 |
| tree | 2f85cca3d2271f9dfd7ac8aeb57ab605c1b8a0f7 | |
| parent | 429d4db8b180f505da9b7a4c8e567151300748bb [diff] | |
| parent | ff9c02ac822dc3fbcad110aaa4c812837fc4f507 [diff] |
Merge "Fix iterator in ServiceManager::removeCallback" am: 73f4c61ceb am: 5c4f6504a1 am: ff9c02ac82 Change-Id: Id8b89b12243fcadbdb8965eb310569913108e381
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp index 2d2af3c..141171b 100644 --- a/cmds/servicemanager/ServiceManager.cpp +++ b/cmds/servicemanager/ServiceManager.cpp
@@ -314,7 +314,7 @@ if (listeners.empty()) { *it = mNameToCallback.erase(*it); } else { - it++; + (*it)++; } }