commit 1bde6f428e8742cbd8cc72c26967d32f10979694
author Bjorn Bringert <bringert@android.com> Wed Apr 27 01:16:21 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 27 01:16:21 2011 -0700
tree 86299ff4d02301bc0f04229e5daf2b6b64effab3
parent ece92d34fcf273f68f33d2fd8e5764764fc0c66d
parent 4bbca889df9ca76c398f3a11e871fc6ad4a4514d

Merge "Expose TTS engine API"

core/java/android/view/inputmethod/InputMethodSubtype.java

diff --git a/core/java/android/view/inputmethod/InputMethodSubtype.java b/core/java/android/view/inputmethod/InputMethodSubtype.java
index 25f2229..807f6ce 100644
--- a/core/java/android/view/inputmethod/InputMethodSubtype.java
+++ b/core/java/android/view/inputmethod/InputMethodSubtype.java
@@ -60,8 +60,7 @@
         mSubtypeLocale = locale != null ? locale : "";
         mSubtypeMode = mode != null ? mode : "";
         mSubtypeExtraValue = extraValue != null ? extraValue : "";
-        mSubtypeHashCode = hashCodeInternal(mSubtypeNameResId, mSubtypeIconResId, mSubtypeLocale,
-                mSubtypeMode, mSubtypeExtraValue);
+        mSubtypeHashCode = hashCodeInternal(mSubtypeLocale, mSubtypeMode, mSubtypeExtraValue);
     }
 
     InputMethodSubtype(Parcel source) {
@@ -74,8 +73,7 @@
         mSubtypeMode = s != null ? s : "";
         s = source.readString();
         mSubtypeExtraValue = s != null ? s : "";
-        mSubtypeHashCode = hashCodeInternal(mSubtypeNameResId, mSubtypeIconResId, mSubtypeLocale,
-                mSubtypeMode, mSubtypeExtraValue);
+        mSubtypeHashCode = hashCodeInternal(mSubtypeLocale, mSubtypeMode, mSubtypeExtraValue);
     }
 
     /**
@@ -195,9 +193,8 @@
         }
     };
 
-    private static int hashCodeInternal(int nameResId, int iconResId, String locale,
-            String mode, String extraValue) {
-        return Arrays.hashCode(new Object[] {nameResId, iconResId, locale, mode, extraValue});
+    private static int hashCodeInternal(String locale, String mode, String extraValue) {
+        return Arrays.hashCode(new Object[] {locale, mode, extraValue});
     }
 
     /**