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

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3

Browse Source 
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
This commit is contained in:
Android Build Merger (Role)
2018-02-15 00:05:38 +00:00
parent 15754b34be a381c4ced3
commit 30a705874a
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}