commit eaa093272e2a4cb3129dfe7b598bd7af969726b0
author Siyamed Sinir <siyamed@google.com> Thu Feb 15 00:14:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 15 00:14:36 2018 +0000
tree f87897a19682059d1df7eb8cca909a4ba2a1977c
parent e137462b2c6e8e8c64a97d94e319bbcf1c57f330
parent a381c4ced38de01c88f7e660d5dab85607675ce4

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

core/java/android/app/KeyguardManager.java

diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java
index 2c12317..4bebdfa 100644
--- a/core/java/android/app/KeyguardManager.java
+++ b/core/java/android/app/KeyguardManager.java
@@ -249,7 +249,7 @@
      */
     public boolean isDeviceLocked(int userId) {
         try {
-            return mTrustManager.isDeviceLocked(userId);
+            return getTrustManager().isDeviceLocked(userId);
         } catch (RemoteException e) {
             return false;
         }
@@ -274,12 +274,20 @@
      */
     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}