Merge "Fix issue #5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0

Dianne Hackborn · Android (Google) Code Review · commit 163620417bc2 · 2011-10-19T17:15:39.000-07:00
diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java
@@ -691,7 +691,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                 }
                 ISpellCheckerService spellChecker = ISpellCheckerService.Stub.asInterface(service);
                 final SpellCheckerBindGroup group = mSpellCheckerBindGroups.get(mSciId);
-                if (this == group.mInternalConnection) {
+                if (group != null && this == group.mInternalConnection) {
                     group.onServiceConnected(spellChecker);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {`
`691`	`691`	`}`
`692`	`692`	`ISpellCheckerService spellChecker = ISpellCheckerService.Stub.asInterface(service);`
`693`	`693`	`final SpellCheckerBindGroup group = mSpellCheckerBindGroups.get(mSciId);`
`694`		`- if (this == group.mInternalConnection) {`
	`694`	`+ if (group != null && this == group.mInternalConnection) {`
`695`	`695`	`group.onServiceConnected(spellChecker);`
`696`	`696`	`}`
`697`	`697`	`}`