Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc31f28 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge changes from topic "remove_stop_face_auth_on_display_off" into main 

* changes:
  Remove stop_face_auth_on_display_off flag
  Remove fp_listen_occluding_apps flag
parents bb07210c b2e716ce

packages/SystemUI/res/values/flags.xml

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
         protected. -->

    <bool name="flag_battery_shield_icon">false</bool>



    <!-- Whether face auth will immediately stop when the display state is OFF -->

    <bool name="flag_stop_face_auth_on_display_off">true</bool>



    <!-- Whether we want to stop pulsing while running the face scanning animation -->

    <bool name="flag_stop_pulsing_face_scanning_animation">true</bool>

</resources>

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

+14 −24
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;
@@ -161,8 +160,6 @@ import com.android.systemui.dagger.qualifiers.Background; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpsysTableLogger;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyguard.domain.interactor.FaceAuthenticationListener;

import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor;

import com.android.systemui.keyguard.shared.constants.TrustAgentUiEvent;
@@ -417,7 +414,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private final ActiveUnlockConfig mActiveUnlockConfig;

    private final IDreamManager mDreamManager;

    private final TelephonyManager mTelephonyManager;

    private final FeatureFlags mFeatureFlags;

    @Nullable

    private final FingerprintManager mFpm;

    @Nullable
@@ -2365,7 +2361,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            FaceWakeUpTriggersConfig faceWakeUpTriggersConfig,

            DevicePostureController devicePostureController,

            Optional<FingerprintInteractiveToAuthProvider> interactiveToAuthProvider,

            FeatureFlags featureFlags,

            TaskStackChangeListeners taskStackChangeListeners,

            IActivityTaskManager activityTaskManagerService,

            DisplayTracker displayTracker) {
@@ -2400,7 +2395,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mPackageManager = packageManager;

        mFpm = fingerprintManager;

        mFaceManager = faceManager;

        mFeatureFlags = featureFlags;

        mActiveUnlockConfig.setKeyguardUpdateMonitor(this);

        mFaceAcquiredInfoIgnoreList = Arrays.stream(

                mContext.getResources().getIntArray(
@@ -2417,9 +2411,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        mTaskStackChangeListeners = taskStackChangeListeners;

        mActivityTaskManager = activityTaskManagerService;

        mDisplayTracker = displayTracker;

        if (mFeatureFlags.isEnabled(Flags.STOP_FACE_AUTH_ON_DISPLAY_OFF)) {

        mDisplayTracker.addDisplayChangeCallback(mDisplayCallback, mainExecutor);

        }



        mHandler = new Handler(mainLooper) {

            @Override
@@ -4205,7 +4197,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 +4211,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                            mAllowFingerprintOnCurrentOccludingActivity);

                    updateFingerprintListeningState(BIOMETRIC_ACTION_UPDATE);

                }

                }



                RootTaskInfo assistantTask = mActivityTaskManager.getRootTaskInfo(

                        WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_ASSISTANT);

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −9
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")
@@ -312,11 +308,6 @@ object Flags { 
    val KEYGUARD_WM_STATE_REFACTOR: UnreleasedFlag =

            unreleasedFlag("keyguard_wm_state_refactor")



    /** Stop running face auth when the display state changes to OFF. */

    // TODO(b/294221702): Tracking bug.

    @JvmField val STOP_FACE_AUTH_ON_DISPLAY_OFF = resourceBooleanFlag(

            R.bool.flag_stop_face_auth_on_display_off, "stop_face_auth_on_display_off")



    /** Flag to disable the face scanning animation pulsing. */

    // TODO(b/295245791): Tracking bug.

    @JvmField val STOP_PULSING_FACE_SCANNING_ANIMATION = resourceBooleanFlag(

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

+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() {

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+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 } }