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

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

Have unified setter/getter for Secure Settings. 

In order to make InputMethodManagerService encryption-aware, we are
going to introduce a new state where any read/write access to Secure
Settings from IMMS is virtualized so that we can temporarily enable
only encryption-aware IMEs until the user unlocks the device then revert
any changes made before the device enters into an unlocked state.

To do that, it would be convenient if InputMethodUtils has unified
getter/setter methods to access (Secure) settings.  In subsequent CLs we
will rely on those getter/setter methods to switch between the on-memory
data store and the actual Secure Settings.  Note that because of
multi-user support such a switch can occur multiple times.

This is still a preparation code.  Behavior change is not intended yet
in this CL.

Bug: 26279466
Change-Id: I0f79243e5cc1556764da37fa38078e075a27d42b
parent 94e3330e

core/java/com/android/internal/inputmethod/InputMethodUtils.java

+40 −31
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.pm.PackageManager; 
import android.content.res.Resources;

import android.os.RemoteException;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.text.TextUtils;

import android.text.TextUtils.SimpleStringSplitter;

import android.util.ArrayMap;
@@ -899,6 +898,31 @@ public class InputMethodUtils { 
            mCurrentUserId = userId;

        }



        private void putString(final String key, final String str) {

            Settings.Secure.putStringForUser(mResolver, key, str, mCurrentUserId);

        }



        private String getString(final String key) {

            return Settings.Secure.getStringForUser(mResolver, key, mCurrentUserId);

        }



        private void putInt(final String key, final int value) {

            Settings.Secure.putIntForUser(mResolver, key, value, mCurrentUserId);

        }



        private int getInt(final String key, final int defaultValue) {

            return Settings.Secure.getIntForUser(mResolver, key, defaultValue, mCurrentUserId);

        }



        private void putBoolean(final String key, final boolean value) {

            Settings.Secure.putIntForUser(mResolver, key, value ? 1 : 0, mCurrentUserId);

        }



        private boolean getBoolean(final String key, final boolean defaultValue) {

            return Settings.Secure.getIntForUser(mResolver, key, defaultValue ? 1 : 0,

                    mCurrentUserId) == 1;

        }



        public void setCurrentProfileIds(int[] currentProfileIds) {

            synchronized (this) {

                mCurrentProfileIds = currentProfileIds;
@@ -1035,17 +1059,15 @@ public class InputMethodUtils { 
        }



        private void putEnabledInputMethodsStr(String str) {

            Settings.Secure.putStringForUser(

                    mResolver, Settings.Secure.ENABLED_INPUT_METHODS, str, mCurrentUserId);

            mEnabledInputMethodsStrCache = str;

            if (DEBUG) {

                Slog.d(TAG, "putEnabledInputMethodStr: " + str);

            }

            putString(Settings.Secure.ENABLED_INPUT_METHODS, str);

            mEnabledInputMethodsStrCache = str;

        }



        public String getEnabledInputMethodsStr() {

            mEnabledInputMethodsStrCache = Settings.Secure.getStringForUser(

                    mResolver, Settings.Secure.ENABLED_INPUT_METHODS, mCurrentUserId);

            mEnabledInputMethodsStrCache = getString(Settings.Secure.ENABLED_INPUT_METHODS);

            if (DEBUG) {

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

                        + ", " + mCurrentUserId);
@@ -1103,8 +1125,7 @@ public class InputMethodUtils { 
            if (DEBUG) {

                Slog.d(TAG, "putSubtypeHistoryStr: " + str);

            }

            Settings.Secure.putStringForUser(

                    mResolver, Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, str, mCurrentUserId);

            putString(Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, str);

        }



        public Pair<String, String> getLastInputMethodAndSubtypeLocked() {
@@ -1222,12 +1243,11 @@ public class InputMethodUtils { 
        }



        private String getSubtypeHistoryStr() {

            final String history = getString(Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY);

            if (DEBUG) {

                Slog.d(TAG, "getSubtypeHistoryStr: " + Settings.Secure.getStringForUser(

                        mResolver, Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, mCurrentUserId));

                Slog.d(TAG, "getSubtypeHistoryStr: " + history);

            }

            return Settings.Secure.getStringForUser(

                    mResolver, Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, mCurrentUserId);

            return history;

        }



        public void putSelectedInputMethod(String imeId) {
@@ -1235,8 +1255,7 @@ public class InputMethodUtils { 
                Slog.d(TAG, "putSelectedInputMethodStr: " + imeId + ", "

                        + mCurrentUserId);

            }

            Settings.Secure.putStringForUser(

                    mResolver, Settings.Secure.DEFAULT_INPUT_METHOD, imeId, mCurrentUserId);

            putString(Settings.Secure.DEFAULT_INPUT_METHOD, imeId);

        }



        public void putSelectedSubtype(int subtypeId) {
@@ -1244,18 +1263,15 @@ public class InputMethodUtils { 
                Slog.d(TAG, "putSelectedInputMethodSubtypeStr: " + subtypeId + ", "

                        + mCurrentUserId);

            }

            Settings.Secure.putIntForUser(mResolver, Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE,

                    subtypeId, mCurrentUserId);

            putInt(Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, subtypeId);

        }



        public String getSelectedInputMethod() {

            final String imi = getString(Settings.Secure.DEFAULT_INPUT_METHOD);

            if (DEBUG) {

                Slog.d(TAG, "getSelectedInputMethodStr: " + Settings.Secure.getStringForUser(

                        mResolver, Settings.Secure.DEFAULT_INPUT_METHOD, mCurrentUserId)

                        + ", " + mCurrentUserId);

                Slog.d(TAG, "getSelectedInputMethodStr: " + imi);

            }

            return Settings.Secure.getStringForUser(

                    mResolver, Settings.Secure.DEFAULT_INPUT_METHOD, mCurrentUserId);

            return imi;

        }



        public boolean isSubtypeSelected() {
@@ -1263,22 +1279,15 @@ public class InputMethodUtils { 
        }



        private int getSelectedInputMethodSubtypeHashCode() {

            try {

                return Settings.Secure.getIntForUser(

                        mResolver, Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, mCurrentUserId);

            } catch (SettingNotFoundException e) {

                return NOT_A_SUBTYPE_ID;

            }

            return getInt(Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, NOT_A_SUBTYPE_ID);

        }



        public boolean isShowImeWithHardKeyboardEnabled() {

                return Settings.Secure.getIntForUser(mResolver,

                        Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0, mCurrentUserId) == 1;

            return getBoolean(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, false);

        }



        public void setShowImeWithHardKeyboard(boolean show) {

            Settings.Secure.putIntForUser(mResolver, Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD,

                    show ? 1 : 0, mCurrentUserId);

            putBoolean(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, show);

        }



        public int getCurrentUserId() {