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

* commit '163620417bc2980528e2079e3456c9600a92e165':
  Fix issue #5484096: Device rebooted after turning WiFi tethering ON, IRL19 Crespo.

1 files changed, 1 insertions, 1 deletions

diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java
index 788ecda647c0..a653322df3aa 100644
--- 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);
                 }
             }