summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/textservice
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-08-26 15:48:50 +0900
committersatok <satok@google.com>2011-08-26 16:00:23 +0900
commitfbedf1a3978d5dfc4a886e4c7107d4bc1923f740 (patch)
tree177a9b25b72c94b976d15cd6d1da0f622215d91f /core/java/android/view/textservice
parent2388a7ba6218f44400ee78016282cb96c02dfc54 (diff)
downloadframeworks_base-fbedf1a3978d5dfc4a886e4c7107d4bc1923f740.zip
frameworks_base-fbedf1a3978d5dfc4a886e4c7107d4bc1923f740.tar.gz
frameworks_base-fbedf1a3978d5dfc4a886e4c7107d4bc1923f740.tar.bz2
Fix NPE in setCurrentSpellCheckerSubtype
Change-Id: I9fce999f91dcccd2f877a0326c4f2e3ac9024f85
Diffstat (limited to 'core/java/android/view/textservice')
-rw-r--r--core/java/android/view/textservice/TextServicesManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java
index 89c4bcb..3e376da 100644
--- a/core/java/android/view/textservice/TextServicesManager.java
+++ b/core/java/android/view/textservice/TextServicesManager.java
@@ -162,10 +162,13 @@ public final class TextServicesManager {
*/
public void setSpellCheckerSubtype(SpellCheckerSubtype subtype) {
try {
+ final int hashCode;
if (subtype == null) {
- throw new NullPointerException("SpellCheckerSubtype is null.");
+ hashCode = 0;
+ } else {
+ hashCode = subtype.hashCode();
}
- sService.setCurrentSpellCheckerSubtype(null, subtype.hashCode());
+ sService.setCurrentSpellCheckerSubtype(null, hashCode);
} catch (RemoteException e) {
Log.e(TAG, "Error in setSpellCheckerSubtype:" + e);
}