Merge "Prevents activity becomes invisible while keyguard going-away" into main (20c56e7b) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -6079,9 +6079,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return false;
		}

		// Check if the activity is on a sleeping display, canTurnScreenOn will also check
		// keyguard visibility
		if (mDisplayContent.isSleeping()) {
		// Check if the activity is on a sleeping display and keyguard is not going away (to
		// align with TaskFragment#shouldSleepActivities), canTurnScreenOn will also check keyguard
		// visibility
		if (mDisplayContent.isSleeping() && !mDisplayContent.isKeyguardGoingAway()) {
		return canTurnScreenOn();
		} else {
		return mTaskSupervisor.getKeyguardController().checkKeyguardVisibility(this);