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

Check if InputMethodService is Direct Boot aware am: 4e44a5ec8e

Browse Source 
am: fc7672a010

Change-Id: Ie2fbffb005ea53f52643839a1d32054178b06e32
This commit is contained in:
Yohei Yukawa
2016-07-28 23:20:33 +00:00
committed by android-build-merger
parent 89009352ed fc7672a010
commit f6bd4d7f32
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.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -149,7 +148,7 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref
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 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref
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();