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

2011-10-19 17:15:39 -07:00
parent 018cb119bc c7d233d93f
commit 163620417b
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/TextServicesManagerService.java
+++ b/services/java/com/android/server/TextServicesManagerService.java
@@ -691,7 +691,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
                }
                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);
                }
            }