diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-10-03 16:30:17 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2013-10-03 16:35:21 +0900 |
| commit | 92a6f3018ace5aa2d5ea74e7d378b6960b5e053e (patch) | |
| tree | 45682f768b7b1f46eec3b1ba8cf43319016bd220 | |
| parent | 19db5200696de2ca5ad90504cde853da18fee063 (diff) | |
| download | frameworks_base-92a6f3018ace5aa2d5ea74e7d378b6960b5e053e.zip frameworks_base-92a6f3018ace5aa2d5ea74e7d378b6960b5e053e.tar.gz frameworks_base-92a6f3018ace5aa2d5ea74e7d378b6960b5e053e.tar.bz2 | |
Fix InputMethodSubtype#equals corresponding to hashCode
Change-Id: Ic9305a6f0f5d753f0ad674ad6c9ee648cc8a6ce9
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodSubtype.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodSubtype.java b/core/java/android/view/inputmethod/InputMethodSubtype.java index 88b2977..eee09d2 100644 --- a/core/java/android/view/inputmethod/InputMethodSubtype.java +++ b/core/java/android/view/inputmethod/InputMethodSubtype.java @@ -459,12 +459,12 @@ public final class InputMethodSubtype implements Parcelable { return (subtype.hashCode() == hashCode()); } return (subtype.hashCode() == hashCode()) - && (subtype.getNameResId() == getNameResId()) - && (subtype.getMode().equals(getMode())) - && (subtype.getIconResId() == getIconResId()) && (subtype.getLocale().equals(getLocale())) + && (subtype.getMode().equals(getMode())) && (subtype.getExtraValue().equals(getExtraValue())) && (subtype.isAuxiliary() == isAuxiliary()) + && (subtype.overridesImplicitlyEnabledSubtype() + == overridesImplicitlyEnabledSubtype()) && (subtype.isAsciiCapable() == isAsciiCapable()); } return false; |