diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-10-19 17:17:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 17:17:29 -0700 |
| commit | bf83971ba883e30e778558cf4df1e034233214c9 (patch) | |
| tree | b1743dfab60d41c52c2f60f876a051ed052aa44b /services | |
| parent | 6ca2b062c5fae4f166480407f645072416ea18ac (diff) | |
| parent | 163620417bc2980528e2079e3456c9600a92e165 (diff) | |
| download | frameworks_base-bf83971ba883e30e778558cf4df1e034233214c9.zip frameworks_base-bf83971ba883e30e778558cf4df1e034233214c9.tar.gz frameworks_base-bf83971ba883e30e778558cf4df1e034233214c9.tar.bz2 | |
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.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/TextServicesManagerService.java | 2 |
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 788ecda..a653322 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); } } |