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

Commit c39dcef3 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Remove unused InputMethodSettings#mEnabledInputMethodsStrCache 

Now that

  InputMethodSettings#mEnabledInputMethodsStrCache

has no side effect thus can be safely removed.

Bug: 309837937
Test: presubmit
Change-Id: I5e5ad23724f28ce89427503df930355ea2061e2e
parent 411c02dd

services/core/java/com/android/server/inputmethod/InputMethodUtils.java

+1 −14
Original line number Diff line number Diff line
@@ -214,8 +214,6 @@ final class InputMethodUtils { 
        private final ArrayMap<String, InputMethodInfo> mMethodMap;



        private boolean mCopyOnWrite = false;

        @NonNull

        private String mEnabledInputMethodsStrCache = "";

        @UserIdInt

        private int mCurrentUserId;
@@ -247,9 +245,6 @@ final class InputMethodUtils { 
            if (DEBUG) {

                Slog.d(TAG, "--- Switch the current user from " + mCurrentUserId + " to " + userId);

            }

            if (mCurrentUserId != userId || mCopyOnWrite != copyOnWrite) {

                mEnabledInputMethodsStrCache = "";

            }

            mCurrentUserId = userId;

            mCopyOnWrite = copyOnWrite;

        }
@@ -408,18 +403,11 @@ final class InputMethodUtils { 
            } else {

                putString(Settings.Secure.ENABLED_INPUT_METHODS, str);

            }

            // TODO: Update callers of putEnabledInputMethodsStr to make str @NonNull.

            mEnabledInputMethodsStrCache = (str != null ? str : "");

        }



        @NonNull

        String getEnabledInputMethodsStr() {

            mEnabledInputMethodsStrCache = getString(Settings.Secure.ENABLED_INPUT_METHODS, "");

            if (DEBUG) {

                Slog.d(TAG, "getEnabledInputMethodsStr: " + mEnabledInputMethodsStrCache

                        + ", " + mCurrentUserId);

            }

            return mEnabledInputMethodsStrCache;

            return getString(Settings.Secure.ENABLED_INPUT_METHODS, "");

        }



        private void saveSubtypeHistory(
@@ -853,7 +841,6 @@ final class InputMethodUtils { 
        public void dumpLocked(final Printer pw, final String prefix) {

            pw.println(prefix + "mCurrentUserId=" + mCurrentUserId);

            pw.println(prefix + "mCopyOnWrite=" + mCopyOnWrite);

            pw.println(prefix + "mEnabledInputMethodsStrCache=" + mEnabledInputMethodsStrCache);

        }

    }