diff options
author | Satoshi Kataoka <satok@google.com> | 2012-10-09 17:34:04 +0900 |
---|---|---|
committer | Satoshi Kataoka <satok@google.com> | 2012-10-12 00:58:24 +0900 |
commit | 1eac6b7b0554eb126d113e49009208a1da5f23d9 (patch) | |
tree | c0bc06c376ef5758bcc94344f3205d02f93879b4 /core/java/android/view/textservice | |
parent | e1f4ebf559f7ddbfe19ea9a1823a62f3d8b80d71 (diff) | |
download | frameworks_base-1eac6b7b0554eb126d113e49009208a1da5f23d9.zip frameworks_base-1eac6b7b0554eb126d113e49009208a1da5f23d9.tar.gz frameworks_base-1eac6b7b0554eb126d113e49009208a1da5f23d9.tar.bz2 |
Don't update the text services locale in the main thread
This is a revised version of I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
Bug: 6761326
Change-Id: I43a0a65df6e4b6941bd0dca548c4af20b7e5bf58
Diffstat (limited to 'core/java/android/view/textservice')
-rw-r--r-- | core/java/android/view/textservice/TextServicesManager.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java index 81b36db..e0e19b9 100644 --- a/core/java/android/view/textservice/TextServicesManager.java +++ b/core/java/android/view/textservice/TextServicesManager.java @@ -217,6 +217,12 @@ public final class TextServicesManager { public SpellCheckerSubtype getCurrentSpellCheckerSubtype( boolean allowImplicitlySelectedSubtype) { try { + if (sService == null) { + // TODO: This is a workaround. Needs to investigate why sService could be null + // here. + Log.e(TAG, "sService is null."); + return null; + } // Passing null as a locale until we support multiple enabled spell checker subtypes. return sService.getCurrentSpellCheckerSubtype(null, allowImplicitlySelectedSubtype); } catch (RemoteException e) { |