commit 2cf1cf098513807ffd3420ae106f438e943d0cd8
author satok <satok@google.com> Fri Oct 21 15:25:23 2011 +0900
committer satok <satok@google.com> Fri Oct 21 15:25:23 2011 +0900
tree 305039d6fe052c26f1e89e119fb472269b1ae122
parent 16bece04bdbac9af5228436f70267ec5763315de

Fix possible NPE

Bug: 5494803
Change-Id: I6f9d0076405ab7c99076a1168198c2ee70ad5082

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