Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix DeadObjectException of the spell checker"

Browse Source
This commit is contained in:
satok
2011-08-31 00:49:39 -07:00
committed by Android (Google) Code Review
parent 27c6837d57 c7b60f72dd
commit 8da2a004b8
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
Settings.Secure.getString(mContext.getContentResolver(), Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.SELECTED_SPELL_CHECKER_SUBTYPE); Settings.Secure.SELECTED_SPELL_CHECKER_SUBTYPE);
if (DBG) { if (DBG) {
Slog.w(TAG, "getCurrentSpellChecker: " + subtypeHashCodeStr); Slog.w(TAG, "getCurrentSpellCheckerSubtype: " + subtypeHashCodeStr);
} }
final SpellCheckerInfo sci = getCurrentSpellChecker(null); final SpellCheckerInfo sci = getCurrentSpellChecker(null);
if (sci == null || sci.getSubtypeCount() == 0) { if (sci == null || sci.getSubtypeCount() == 0) {
@@ -509,7 +509,8 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
listener.mScLocale, listener.mScListener, listener.mBundle); listener.mScLocale, listener.mScListener, listener.mBundle);
listener.mTsListener.onServiceConnected(session); listener.mTsListener.onServiceConnected(session);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "Exception in getting the spell checker session: " + e); Slog.e(TAG, "Exception in getting the spell checker session."
+ "Reconnect to the spellchecker. ", e);
removeAll(); removeAll();
return; return;
} }
@@ -579,8 +580,12 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
Slog.d(TAG, "cleanLocked"); Slog.d(TAG, "cleanLocked");
} }
if (mListeners.isEmpty()) { if (mListeners.isEmpty()) {
if (mSpellCheckerBindGroups.containsKey(this)) { final String sciId = mInternalConnection.mSciId;
mSpellCheckerBindGroups.remove(this); if (mSpellCheckerBindGroups.containsKey(sciId)) {
if (DBG) {
Slog.d(TAG, "Remove bind group.");
}
mSpellCheckerBindGroups.remove(sciId);
} }
// Unbind service when there is no active clients. // Unbind service when there is no active clients.
mContext.unbindService(mInternalConnection); mContext.unbindService(mInternalConnection);