From 92a6f3018ace5aa2d5ea74e7d378b6960b5e053e Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Thu, 3 Oct 2013 16:30:17 +0900 Subject: Fix InputMethodSubtype#equals corresponding to hashCode Change-Id: Ic9305a6f0f5d753f0ad674ad6c9ee648cc8a6ce9 --- core/java/android/view/inputmethod/InputMethodSubtype.java | 6 +++--- 1 file 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; -- cgit v1.1