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

Merge "DO NOT MERGE Fix mTrustManager NPE" into mnc-dev

Browse Source
This commit is contained in:
Siyamed Sinir
2018-02-15 00:14:36 +00:00
committed by Android (Google) Code Review
parent e137462b2c a381c4ced3
commit eaa093272e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/KeyguardManager.java
View File

@@ -249,7 +249,7 @@ public class KeyguardManager {
*/
public boolean isDeviceLocked(int userId) {
try {
return mTrustManager.isDeviceLocked(userId);
return getTrustManager().isDeviceLocked(userId);
} catch (RemoteException e) {
return false;
}
@@ -274,12 +274,20 @@ public class KeyguardManager {
*/
public boolean isDeviceSecure(int userId) {
try {
return mTrustManager.isDeviceSecure(userId);
return getTrustManager().isDeviceSecure(userId);
} catch (RemoteException e) {
return false;
}
}
private synchronized ITrustManager getTrustManager() {
if (mTrustManager == null) {
mTrustManager = ITrustManager.Stub.asInterface(
ServiceManager.getService(Context.TRUST_SERVICE));
}
return mTrustManager;
}
/**
* @deprecated Use {@link android.view.WindowManager.LayoutParams#FLAG_DISMISS_KEYGUARD}
* and/or {@link android.view.WindowManager.LayoutParams#FLAG_SHOW_WHEN_LOCKED}