am 2cf1cf0: Fix possible NPE

satok16 · Android Git Automerger · commit 48019c65edb6 · 2011-10-20T23:35:27.000-07:00
* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8':
  Fix possible NPE
diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java
@@ -701,7 +701,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
         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);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {`
`701`	`701`	`public void onServiceDisconnected(ComponentName name) {`
`702`	`702`	`synchronized(mSpellCheckerMap) {`
`703`	`703`	`final SpellCheckerBindGroup group = mSpellCheckerBindGroups.get(mSciId);`
`704`		`- if (this == group.mInternalConnection) {`
	`704`	`+ if (group != null && this == group.mInternalConnection) {`
`705`	`705`	`mSpellCheckerBindGroups.remove(mSciId);`
`706`	`706`	`}`
`707`	`707`	`}`