Merge "Fix isOccludedByApp to exclude when occluded by communal (a non-app)." into main (203def72) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/OccludingAppDeviceEntryInteractor.kt

+10 −3

Original line number	Diff line number	Diff line
		@@ -70,7 +70,14 @@ constructor(
		) {
		private val keyguardOccludedByApp: Flow<Boolean> =
		if (KeyguardWmStateRefactor.isEnabled) {
		keyguardTransitionInteractor.currentKeyguardState.map { it == KeyguardState.OCCLUDED }
		combine(
		keyguardTransitionInteractor.currentKeyguardState,
		communalSceneInteractor.isIdleOnCommunal,
		::Pair,
		)
		.map { (currentState, isIdleOnCommunal) ->
		currentState == KeyguardState.OCCLUDED && !isIdleOnCommunal
		}
		} else {
		combine(
		keyguardInteractor.isKeyguardOccluded,
		@@ -120,7 +127,7 @@ constructor(
		// On fingerprint success when the screen is on and not dreaming, go to the home screen
		fingerprintUnlockSuccessEvents
		.sample(
		combine(powerInteractor.isInteractive, keyguardInteractor.isDreaming, ::Pair),
		combine(powerInteractor.isInteractive, keyguardInteractor.isDreaming, ::Pair)
		)
		.collect { (interactive, dreaming) ->
		if (interactive && !dreaming) {
		@@ -148,7 +155,7 @@ constructor(
		}
		},
		/* cancel= */ null,
		/* afterKeyguardGone */ false
		/* afterKeyguardGone */ false,
		)
		}
		}