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

Commit b2e716ce authored by Beverly's avatar Beverly
Browse files

Remove stop_face_auth_on_display_off flag 

Test: atest KeyguardUpdateMonitorTest
Fixes: 294221702
Change-Id: Ib64f285c7d24cd319ebc7ead2bd1bed5acd435fd
parent fd9ca4bc

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

+1 −8
Original line number Diff line number Diff line
@@ -160,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;
@@ -416,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
@@ -2364,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) {
@@ -2399,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(
@@ -2416,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

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

+0 −5
Original line number Diff line number Diff line
@@ -308,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/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+1 −12
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import static com.android.keyguard.KeyguardUpdateMonitor.BIOMETRIC_STATE_CANCELL 
import static com.android.keyguard.KeyguardUpdateMonitor.DEFAULT_CANCEL_SIGNAL_TIMEOUT;

import static com.android.keyguard.KeyguardUpdateMonitor.HAL_POWER_PRESS_TIMEOUT;

import static com.android.keyguard.KeyguardUpdateMonitor.getCurrentUser;

import static com.android.systemui.flags.Flags.STOP_FACE_AUTH_ON_DISPLAY_OFF;

import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_CLOSED;

import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED;

import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_UNKNOWN;
@@ -140,7 +139,6 @@ import com.android.systemui.biometrics.AuthController; 
import com.android.systemui.biometrics.FingerprintInteractiveToAuthProvider;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.log.SessionTracker;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.settings.FakeDisplayTracker;
@@ -294,7 +292,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    private final Executor mBackgroundExecutor = Runnable::run;

    private final Executor mMainExecutor = Runnable::run;

    private TestableLooper mTestableLooper;

    private FakeFeatureFlags mFeatureFlags;

    private Handler mHandler;

    private TestableKeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private MockitoSession mMockitoSession;
@@ -349,8 +346,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 


        mTestableLooper = TestableLooper.get(this);

        allowTestableLooperAsMainThread();

        mFeatureFlags = new FakeFeatureFlags();

        mFeatureFlags.set(STOP_FACE_AUTH_ON_DISPLAY_OFF, false);



        when(mSecureSettings.getUriFor(anyString())).thenReturn(mURI);
@@ -2968,11 +2963,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        verify(callback).onBiometricEnrollmentStateChanged(BiometricSourceType.FACE);

    }



    @Test

    public void stopFaceAuthOnDisplayOffFlagNotEnabled_doNotRegisterForDisplayCallback() {

        assertThat(mDisplayTracker.getDisplayCallbacks().size()).isEqualTo(0);

    }



    @Test

    public void onDisplayOn_nothingHappens() throws RemoteException {

        // GIVEN
@@ -3315,7 +3305,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        clearInvocations(mFingerprintManager);

        clearInvocations(mBiometricManager);

        clearInvocations(mStatusBarStateController);

        mFeatureFlags.set(STOP_FACE_AUTH_ON_DISPLAY_OFF, true);

        mKeyguardUpdateMonitor = new TestableKeyguardUpdateMonitor(mContext);

        setupBiometrics(mKeyguardUpdateMonitor);

        assertThat(mDisplayTracker.getDisplayCallbacks().size()).isEqualTo(1);
@@ -3397,7 +3386,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
                    mDreamManager, mDevicePolicyManager, mSensorPrivacyManager, mTelephonyManager,

                    mPackageManager, mFaceManager, mFingerprintManager, mBiometricManager,

                    mFaceWakeUpTriggersConfig, mDevicePostureController,

                    Optional.of(mInteractiveToAuthProvider), mFeatureFlags,

                    Optional.of(mInteractiveToAuthProvider),

                    mTaskStackChangeListeners, mActivityTaskManager, mDisplayTracker);

            setStrongAuthTracker(KeyguardUpdateMonitorTest.this.mStrongAuthTracker);

        }