PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check if InputMethodService is Direct Boot aware" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-28 23:07:02 +00:00
committed by Android (Google) Code Review
parent e4ae0a88c0 4e44a5ec8e
commit 86547c2303
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/inputmethod/InputMethodPreference.java
View File

@@ -35,7 +35,6 @@ import android.widget.Toast;
import com.android.internal.inputmethod.InputMethodUtils; import com.android.internal.inputmethod.InputMethodUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.RestrictedSwitchPreference;
@@ -149,7 +148,7 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref
if (InputMethodUtils.isSystemIme(mImi)) { if (InputMethodUtils.isSystemIme(mImi)) {
// Enable a system IME. No need to show a security warning dialog, // 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. // 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); setCheckedInternal(true);
} else { } else {
showDirectBootWarnDialog(); showDirectBootWarnDialog();
@@ -245,7 +244,7 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref
public void onClick(final DialogInterface dialog, final int which) { public void onClick(final DialogInterface dialog, final int which) {
// The user confirmed to enable a 3rd party IME, but we might // The user confirmed to enable a 3rd party IME, but we might
// need to prompt if it's not Direct Boot aware. // need to prompt if it's not Direct Boot aware.
if (Utils.isPackageDirectBootAware(getContext(), mImi.getPackageName())) { if (mImi.getServiceInfo().directBootAware) {
setCheckedInternal(true); setCheckedInternal(true);
} else { } else {
showDirectBootWarnDialog(); showDirectBootWarnDialog();