Merge "Don't show dismissible keyguard in app pinning mode" into main (a601d9e6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -327,6 +327,7 @@ public class KeyguardService extends Service {
		private final KeyguardDismissInteractor mKeyguardDismissInteractor;
		private final KeyguardServiceShowLockscreenInteractor mKeyguardServiceShowLockscreenInteractor;
		private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;
		private final ActivityManager mActivityManager;

		@Inject
		public KeyguardService(
		@@ -353,7 +354,8 @@ public class KeyguardService extends Service {
		Lazy<DeviceEntryInteractor> deviceEntryInteractorLazy,
		KeyguardStateCallbackInteractor keyguardStateCallbackInteractor,
		KeyguardServiceShowLockscreenInteractor keyguardServiceShowLockscreenInteractor,
		KeyguardUpdateMonitor keyguardUpdateMonitor) {
		KeyguardUpdateMonitor keyguardUpdateMonitor,
		ActivityManager activityManager) {
		super();
		mKeyguardViewMediator = keyguardViewMediator;
		mKeyguardLifecyclesDispatcher = keyguardLifecyclesDispatcher;
		@@ -387,6 +389,7 @@ public class KeyguardService extends Service {
		mKeyguardDismissInteractor = keyguardDismissInteractor;
		mKeyguardServiceShowLockscreenInteractor = keyguardServiceShowLockscreenInteractor;
		mKeyguardUpdateMonitor = keyguardUpdateMonitor;
		mActivityManager = activityManager;
		}

		@Override
		@@ -682,9 +685,12 @@ public class KeyguardService extends Service {
		public void showDismissibleKeyguard() {
		trace("showDismissibleKeyguard");
		checkPermission();
		mKeyguardInteractor.showDismissibleKeyguard();

		if (mActivityManager.getLockTaskModeState() != ActivityManager.LOCK_TASK_MODE_NONE) {
		return;
		}

		mKeyguardInteractor.showDismissibleKeyguard();
		if (KeyguardWmStateRefactor.isEnabled()) {
		mKeyguardServiceShowLockscreenInteractor.onKeyguardServiceShowDismissibleKeyguard();
		} else {