From 143a6869476a4be5962d4bba3b222d078f46b9a0 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Wed, 16 Mar 2016 20:50:28 -0700
Subject: [PATCH] Stop using a deprecated constructor of InputMethodSettings.

This is a follow up CL to my previous CL [1], which added a new
constructor to InputMethodSettings to support File-Based
Encryption (FBE).

Settings app is the only remaining package that depends on the previous
constructor.  To completely deprecate the previous one, this CL lets the
caller switch to the new constructor.

Note that this CL does not change the initial parameters of
InputMethodSettings.  In other words this is a mechanical code
clean-up.

  [1] I9c6f9bb3d51174198e5f73588637f87ea0d90e11
      5db2f16f15549c490c9541602a96f42bef984acb

Bug: 26279466
Change-Id: I09cba4066b95c4a9e89a3e4f83d75b97882502dc
---
 .../settings/inputmethod/InputMethodSettingValuesWrapper.java  | 2 +-
 .../android/settings/inputmethod/PhysicalKeyboardFragment.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
index c4c889da958..e6945739404 100644
--- a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
+++ b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
@@ -73,7 +73,7 @@ class InputMethodSettingValuesWrapper {
     // Ensure singleton
     private InputMethodSettingValuesWrapper(Context context) {
         mSettings = new InputMethodSettings(context.getResources(), context.getContentResolver(),
-                mMethodMap, mMethodList, getDefaultCurrentUserId());
+                mMethodMap, mMethodList, getDefaultCurrentUserId(), false /* copyOnWrite */);
         mImm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
         refreshAllInputMethodAndSubtypes();
     }
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index e6254aded34..80870b4a61a 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -79,7 +79,8 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
                 getContentResolver(),
                 new HashMap<String, InputMethodInfo>(),
                 new ArrayList<InputMethodInfo>(),
-                USER_SYSTEM);
+                USER_SYSTEM,
+                false /* copyOnWrite */);
         mKeyboardAssistanceCategory = Preconditions.checkNotNull(
                 (PreferenceCategory) findPreference(KEYBOARD_ASSISTANCE_CATEGORY));
         mShowVirtualKeyboardSwitch = Preconditions.checkNotNull(