Merge "Background the call to keyguard going away" into main (6e7c076d) · Commits · e / os / android_frameworks_base

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

+23 −20

Original line number	Diff line number	Diff line
		@@ -1847,6 +1847,7 @@ public class KeyguardViewMediator implements CoreStartable,
		// explicitly DO NOT want to call
		// mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
		// here, since that will mess with the device lock state.
		mKeyguardStateController.notifyKeyguardGoingAway(false);
		mUpdateMonitor.dispatchKeyguardGoingAway(false);

		notifyStartedGoingToSleep();
		@@ -2994,7 +2995,6 @@ public class KeyguardViewMediator implements CoreStartable,
		startKeyguardTransition(showing, aodShowing);
		} else {
		try {

		mActivityTaskManagerService.setLockScreenShown(showing, aodShowing);
		} catch (RemoteException ignored) {
		}
		@@ -3650,7 +3650,6 @@ public class KeyguardViewMediator implements CoreStartable,
		return;
		}

		try {
		int flags = KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS
		\| KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER;

		@@ -3667,14 +3666,18 @@ public class KeyguardViewMediator implements CoreStartable,
		if (!KeyguardWmStateRefactor.isEnabled()) {
		// Handled in WmLockscreenVisibilityManager.
		mGoingAwayRequestedForUserId = mSelectedUserInteractor.getSelectedUserId();
		final int goingAwayFlags = flags;
		mUiBgExecutor.execute(() -> {
		Log.d(TAG, "keyguardGoingAway requested for userId: "
		+ mGoingAwayRequestedForUserId);
		mActivityTaskManagerService.keyguardGoingAway(flags);
		}
		try {
		mActivityTaskManagerService.keyguardGoingAway(goingAwayFlags);
		} catch (RemoteException e) {
		mSurfaceBehindRemoteAnimationRequested = false;
		Log.e(TAG, "Failed to report keyguardGoingAway", e);
		}
		});
		}
		}

		/** Hides the surface behind the keyguard by re-showing the keyguard/activity lock screen. */