Remove fp_listen_occluding_apps flag (fd9ca4bc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+13 −16

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT;
		import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
		import static android.os.BatteryManager.CHARGING_POLICY_DEFAULT;
		import static android.os.PowerManager.WAKE_REASON_UNKNOWN;

		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT;
		@@ -4205,7 +4204,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		@Override
		public void onTaskStackChangedBackground() {
		try {
		if (mFeatureFlags.isEnabled(Flags.FP_LISTEN_OCCLUDING_APPS)) {
		RootTaskInfo standardTask = mActivityTaskManager.getRootTaskInfo(
		WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD);
		final boolean previousState = mAllowFingerprintOnCurrentOccludingActivity;
		@@ -4220,7 +4218,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mAllowFingerprintOnCurrentOccludingActivity);
		updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);
		}
		}

		RootTaskInfo assistantTask = mActivityTaskManager.getRootTaskInfo(
		WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_ASSISTANT);

+0 −4

Original line number	Diff line number	Diff line
		@@ -268,10 +268,6 @@ object Flags {
		val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA =
		unreleasedFlag("migrate_split_keyguard_bottom_area", teamfood = true)

		/** Whether to listen for fingerprint authentication over keyguard occluding activities. */
		// TODO(b/283260512): Tracking bug.
		@JvmField val FP_LISTEN_OCCLUDING_APPS = releasedFlag("fp_listen_occluding_apps")

		/** Flag meant to guard the talkback fix for the KeyguardIndicationTextView */
		// TODO(b/286563884): Tracking bug
		@JvmField val KEYGUARD_TALKBACK_FIX = releasedFlag("keyguard_talkback_fix")

+25 −30

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor
		import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.data.repository.DeviceEntryFingerprintAuthRepository
		import com.android.systemui.keyguard.shared.model.ErrorFingerprintAuthenticationStatus
		import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus
		@@ -60,7 +58,6 @@ constructor(
		private val context: Context,
		activityStarter: ActivityStarter,
		powerInteractor: PowerInteractor,
		featureFlags: FeatureFlags,
		) {
		private val keyguardOccludedByApp: Flow<Boolean> =
		combine(
		@@ -93,7 +90,6 @@ constructor(
		.ifKeyguardOccludedByApp(/* elseFlow */ flowOf(null))

		init {
		if (featureFlags.isEnabled(Flags.FP_LISTEN_OCCLUDING_APPS)) {
		scope.launch {
		// On fingerprint success when the screen is on, go to the home screen
		fingerprintUnlockSuccessEvents.sample(powerInteractor.isInteractive).collect {
		@@ -126,7 +122,6 @@ constructor(
		}
		}
		}
		}

		/** Launches an Activity which forces the current app to background by going home. */
		private fun goToHomeScreen() {

+11 −13

Original line number	Diff line number	Diff line
		@@ -59,10 +59,9 @@ object KeyguardRootViewBinder {
		val disposableHandle =
		view.repeatWhenAttached {
		repeatOnLifecycle(Lifecycle.State.CREATED) {
		if (featureFlags.isEnabled(Flags.FP_LISTEN_OCCLUDING_APPS)) {
		launch {
		occludingAppDeviceEntryMessageViewModel.message.collect {
		biometricMessage ->
		occludingAppDeviceEntryMessageViewModel.message.collect { biometricMessage
		->
		if (biometricMessage?.message != null) {
		chipbarCoordinator.displayView(
		createChipbarInfo(
		@@ -75,7 +74,6 @@ object KeyguardRootViewBinder {
		}
		}
		}
		}

		if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
		launch { viewModel.alpha.collect { alpha -> view.alpha = alpha } }

+1 −4

Original line number	Diff line number	Diff line
		@@ -17,8 +17,6 @@
		package com.android.systemui.statusbar.phone;

		import static android.app.StatusBarManager.SESSION_KEYGUARD;

		import static com.android.systemui.flags.Flags.FP_LISTEN_OCCLUDING_APPS;
		import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION;
		import static com.android.systemui.keyguard.WakefulnessLifecycle.UNKNOWN_LAST_WAKE_TIME;

		@@ -702,8 +700,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
		}

		final boolean screenOff = !mUpdateMonitor.isDeviceInteractive();
		if (!mVibratorHelper.hasVibrator() && (screenOff \|\| (mUpdateMonitor.isDreaming()
		&& !mFeatureFlags.isEnabled(FP_LISTEN_OCCLUDING_APPS)))) {
		if (!mVibratorHelper.hasVibrator() && screenOff) {
		mLogger.d("wakeup device on authentication failure (device doesn't have a vibrator)");
		startWakeAndUnlock(MODE_ONLY_WAKE);
		} else if (biometricSourceType == BiometricSourceType.FINGERPRINT