Merge "Send occluded update for apps dismissing keyguard" into main (babe5301) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/KeyguardController.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -771,20 +771,21 @@ class KeyguardController {
		mTopTurnScreenOnActivity.setCurrentLaunchCanTurnScreenOn(false);
		}

		boolean hasChange = false;
		if (!lastKeyguardGoingAway && mKeyguardGoingAway) {
		final boolean startedGoingAway = (!lastKeyguardGoingAway && mKeyguardGoingAway);
		final boolean occludedChanged = (lastOccluded != mOccluded);

		if (startedGoingAway) {
		writeEventLog("dismissIfInsecure");
		controller.handleDismissInsecureKeyguard(display);
		controller.scheduleGoingAwayTimeout(mDisplayId);
		hasChange = true;
		} else if (lastOccluded != mOccluded) {
		}
		if (occludedChanged && (reduceKeyguardTransitions() \|\| !startedGoingAway)) {
		controller.handleOccludedChanged(mDisplayId, mTopOccludesActivity);
		hasChange = true;
		}

		// Collect the participants for shell transition, so that transition won't happen too
		// early since the transition was set ready.
		if (hasChange && top != null && (mOccluded \|\| mKeyguardGoingAway)) {
		if (top != null && (startedGoingAway \|\| (occludedChanged && mOccluded))) {
		display.mTransitionController.collect(top);
		}
		}