Fix possible NPE

satok16 · satok16 · commit 2cf1cf098513 · 2011-10-21T15:25:23.000+09:00
Bug: 5494803
Change-Id: I6f9d0076405ab7c99076a1168198c2ee70ad5082
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`	`}`