summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-10-20 23:35:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-20 23:35:27 -0700
commit48019c65edb6ab8be8da6bfebe532a89bbf62c4f (patch)
treeef61a9b0dee1d4ae8c0f6b69a180476205799d19 /services
parent79174b75285e4ece7b7f736fb1b6091f35b98d95 (diff)
parent2cf1cf098513807ffd3420ae106f438e943d0cd8 (diff)
downloadframeworks_base-48019c65edb6ab8be8da6bfebe532a89bbf62c4f.zip
frameworks_base-48019c65edb6ab8be8da6bfebe532a89bbf62c4f.tar.gz
frameworks_base-48019c65edb6ab8be8da6bfebe532a89bbf62c4f.tar.bz2
am 2cf1cf09: Fix possible NPE
* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8': Fix possible NPE
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/TextServicesManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java
index a653322..1976eba 100644
--- a/services/java/com/android/server/TextServicesManagerService.java
+++ b/services/java/com/android/server/TextServicesManagerService.java
@@ -701,7 +701,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
public void onServiceDisconnected(ComponentName name) {
synchronized(mSpellCheckerMap) {
final SpellCheckerBindGroup group = mSpellCheckerBindGroups.get(mSciId);
- if (this == group.mInternalConnection) {
+ if (group != null && this == group.mInternalConnection) {
mSpellCheckerBindGroups.remove(mSciId);
}
}