[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 (30a70587) · Commits · e / os / android_frameworks_base

core/java/android/app/KeyguardManager.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -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}