Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make InputMethodInfo#isEncryptionAware() strict." into nyc-dev

Browse Source 
am: ae8e090004

* commit 'ae8e0900047253168ad8e62f83e67bd2841f8791':
  Make InputMethodInfo#isEncryptionAware() strict.
This commit is contained in:
Yohei Yukawa
2016-02-09 22:08:01 +00:00
committed by android-build-merger
parent 5ae2d621ad ae8e090004
commit 7f2bfe20e1
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/view/inputmethod/InputMethodInfo.java
View File

@@ -429,15 +429,15 @@ public final class InputMethodInfo implements Parcelable {
}
/**
* @return {@code true} if the IME is marked to be Encryption-Aware.
* @return {@code true} if the {@link android.inputmethodservice.InputMethodService} is marked
* to be Encryption-Aware.
* @hide
*/
public boolean isEncryptionAware() {
if (mService == null || mService.serviceInfo == null ||
mService.serviceInfo.applicationInfo == null) {
if (mService == null || mService.serviceInfo == null) {
return false;
}
return mService.serviceInfo.applicationInfo.isEncryptionAware();
return mService.serviceInfo.encryptionAware;
}
public void dump(Printer pw, String prefix) {
@@ -446,13 +446,6 @@ public final class InputMethodInfo implements Parcelable {
+ " mSupportsSwitchingToNextInputMethod=" + mSupportsSwitchingToNextInputMethod);
pw.println(prefix + "mIsDefaultResId=0x"
+ Integer.toHexString(mIsDefaultResId));
if (mService != null && mService.serviceInfo != null &&
mService.serviceInfo.applicationInfo != null) {
pw.println(" encryptionAware=" +
mService.serviceInfo.applicationInfo.isEncryptionAware());
} else {
pw.println(" encryptionAware=unknown");
}
pw.println(prefix + "Service:");
mService.dump(pw, prefix + " ");
}