commit f6bd4d7f32e6bae751c9fad9af60b23977e29cca
author Yohei Yukawa <yukawa@google.com> Thu Jul 28 23:20:33 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 28 23:20:33 2016 +0000
tree 2a6adbfec33d99051549abf729ea7eeeaef1a633
parent 89009352ed9ce4d2894109511ad71e5833729838
parent fc7672a010405192d5cf75bf5d358d8f2b0c90e7

Check if InputMethodService is Direct Boot aware am: 4e44a5ec8e
am: fc7672a010

Change-Id: Ie2fbffb005ea53f52643839a1d32054178b06e32

src/com/android/settings/inputmethod/InputMethodPreference.java

diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index 2c27700..b2c2800 100755
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -35,7 +35,6 @@
 
 import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
@@ -149,7 +148,7 @@
         if (InputMethodUtils.isSystemIme(mImi)) {
             // Enable a system IME. No need to show a security warning dialog,
             // but we might need to prompt if it's not Direct Boot aware.
-            if (Utils.isPackageDirectBootAware(getContext(), mImi.getPackageName())) {
+            if (mImi.getServiceInfo().directBootAware) {
                 setCheckedInternal(true);
             } else {
                 showDirectBootWarnDialog();
@@ -245,7 +244,7 @@
             public void onClick(final DialogInterface dialog, final int which) {
                 // The user confirmed to enable a 3rd party IME, but we might
                 // need to prompt if it's not Direct Boot aware.
-                if (Utils.isPackageDirectBootAware(getContext(), mImi.getPackageName())) {
+                if (mImi.getServiceInfo().directBootAware) {
                     setCheckedInternal(true);
                 } else {
                     showDirectBootWarnDialog();