commit 48019c65edb6ab8be8da6bfebe532a89bbf62c4f
author satok <satok@google.com> Thu Oct 20 23:35:27 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 20 23:35:27 2011 -0700
tree ef61a9b0dee1d4ae8c0f6b69a180476205799d19
parent 79174b75285e4ece7b7f736fb1b6091f35b98d95
parent 2cf1cf098513807ffd3420ae106f438e943d0cd8

am 2cf1cf09: Fix possible NPE

* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8':
  Fix possible NPE

services/java/com/android/server/TextServicesManagerService.java

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 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);
                 }
             }