Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ece92d34 authored by satok's avatar satok
Browse files

Fix a bug in InputMethodSubtype#hashCode 

Bug: 4345760

Not to use resource ids for calculating hashCode

Change-Id: I29d2555aeb7d0e51205d9f1fe0da708df0890942
parent f076aa55

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

+4 −7
Original line number Original line Diff line number Diff line
@@ -60,8 +60,7 @@ public final class InputMethodSubtype implements Parcelable { 
        mSubtypeLocale = locale != null ? locale : "";

        mSubtypeLocale = locale != null ? locale : "";

        mSubtypeMode = mode != null ? mode : "";

        mSubtypeMode = mode != null ? mode : "";

        mSubtypeExtraValue = extraValue != null ? extraValue : "";

        mSubtypeExtraValue = extraValue != null ? extraValue : "";

        mSubtypeHashCode = hashCodeInternal(mSubtypeNameResId, mSubtypeIconResId, mSubtypeLocale,

        mSubtypeHashCode = hashCodeInternal(mSubtypeLocale, mSubtypeMode, mSubtypeExtraValue);

                mSubtypeMode, mSubtypeExtraValue);

    }

    }





    InputMethodSubtype(Parcel source) {

    InputMethodSubtype(Parcel source) {
@@ -74,8 +73,7 @@ public final class InputMethodSubtype implements Parcelable { 
        mSubtypeMode = s != null ? s : "";

        mSubtypeMode = s != null ? s : "";

        s = source.readString();

        s = source.readString();

        mSubtypeExtraValue = s != null ? s : "";

        mSubtypeExtraValue = s != null ? s : "";

        mSubtypeHashCode = hashCodeInternal(mSubtypeNameResId, mSubtypeIconResId, mSubtypeLocale,

        mSubtypeHashCode = hashCodeInternal(mSubtypeLocale, mSubtypeMode, mSubtypeExtraValue);

                mSubtypeMode, mSubtypeExtraValue);

    }

    }





    /**

    /**
@@ -195,9 +193,8 @@ public final class InputMethodSubtype implements Parcelable { 
        }

        }

    };

    };





    private static int hashCodeInternal(int nameResId, int iconResId, String locale,

    private static int hashCodeInternal(String locale, String mode, String extraValue) {

            String mode, String extraValue) {

        return Arrays.hashCode(new Object[] {locale, mode, extraValue});

        return Arrays.hashCode(new Object[] {nameResId, iconResId, locale, mode, extraValue});

    }

    }





    /**

    /**