drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1

Browse Source
This commit is contained in:
satok
2011-11-30 17:37:52 -08:00
committed by Android (Google) Code Review
parent d8ec8db5e0 4c3fa642ef
commit b94a7fb3d7
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/TextServicesManagerService.java
View File

@ -392,9 +392,16 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
Slog.d(TAG, "FinishSpellCheckerService"); Slog.d(TAG, "FinishSpellCheckerService");
} }
synchronized(mSpellCheckerMap) { synchronized(mSpellCheckerMap) {
final ArrayList<SpellCheckerBindGroup> removeList =
new ArrayList<SpellCheckerBindGroup>();
for (SpellCheckerBindGroup group : mSpellCheckerBindGroups.values()) { for (SpellCheckerBindGroup group : mSpellCheckerBindGroups.values()) {
if (group == null) continue; if (group == null) continue;
group.removeListener(listener); // Use removeList to avoid modifying mSpellCheckerBindGroups in this loop.
removeList.add(group);
}
final int removeSize = removeList.size();
for (int i = 0; i < removeSize; ++i) {
removeList.get(i).removeListener(listener);
} }
} }
} }
@ -669,6 +676,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
} }
} }
// cleanLocked may remove elements from mSpellCheckerBindGroups
private void cleanLocked() { private void cleanLocked() {
if (DBG) { if (DBG) {
Slog.d(TAG, "cleanLocked"); Slog.d(TAG, "cleanLocked");