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

Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1

Browse Source
This commit is contained in:
satok
2011-10-31 18:20:48 -07:00
committed by Android (Google) Code Review
parent b1db20bde5 2520ed8cc3
commit ff93e417a2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,9 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
if (DBG) { if (DBG) {
Slog.w(TAG, "Remove " + removeList.get(i)); Slog.w(TAG, "Remove " + removeList.get(i));
} }
mListeners.remove(removeList.get(i)); final InternalDeathRecipient idr = removeList.get(i);
idr.mScListener.asBinder().unlinkToDeath(idr, 0);
mListeners.remove(idr);
} }
cleanLocked(); cleanLocked();
} }
@ -664,6 +666,11 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
public void removeAll() { public void removeAll() {
Slog.e(TAG, "Remove the spell checker bind unexpectedly."); Slog.e(TAG, "Remove the spell checker bind unexpectedly.");
synchronized(mSpellCheckerMap) { synchronized(mSpellCheckerMap) {
final int size = mListeners.size();
for (int i = 0; i < size; ++i) {
final InternalDeathRecipient idr = mListeners.get(i);
idr.mScListener.asBinder().unlinkToDeath(idr, 0);
}
mListeners.clear(); mListeners.clear();
cleanLocked(); cleanLocked();
} }