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

Merge "Eliminate the inconsistency between the states of AMS and TSMS"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-21 23:45:46 +00:00
committed by Android (Google) Code Review
parent 7cdccf9f2f 787aa8c0db
commit 153a1bdd4b
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/TextServicesManagerService.java
View File

@@ -865,6 +865,17 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
}
}
public void onServiceDisconnected() {
if (DBG) {
Slog.d(TAG, "onServiceDisconnected");
}
synchronized(mSpellCheckerMap) {
mSpellChecker = null;
mConnected = false;
}
}
public void removeListener(ISpellCheckerSessionListener listener) {
if (DBG) {
Slog.w(TAG, "remove listener: " + listener.hashCode());
@@ -1019,10 +1030,17 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
@Override
public void onServiceDisconnected(ComponentName name) {
synchronized(mSpellCheckerMap) {
final SpellCheckerBindGroup group = mSpellCheckerBindGroups.get(mSciId);
if (group != null && this == group.mInternalConnection) {
mSpellCheckerBindGroups.remove(mSciId);
}
onServiceDisconnectedInnerLocked(name);
}
}
private void onServiceDisconnectedInnerLocked(ComponentName name) {
if (DBG) {
Slog.w(TAG, "onServiceDisconnected: " + name);
}
final SpellCheckerBindGroup group = mSpellCheckerBindGroups.get(mSciId);
if (group != null && this == group.mInternalConnection) {
group.onServiceDisconnected();
}
}
}