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

Commit 9d0d1c55 authored by Grace Cheng's avatar Grace Cheng
Browse files

Deflag SidefpsController refactor 

Removing SideFpsController, and removing all flagged code for
SidefpsControllerRefactor

Flag: NONE
Fixes: 288175061
Bug: 287311775
Test: N/A
Change-Id: Ied1e743db40ecffc0ed07aa506eaf9be82c57a0a
parent 50c716ce

core/java/android/hardware/fingerprint/FingerprintManager.java

+0 −18
Original line number Diff line number Diff line
@@ -962,24 +962,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
        }

    }



    // TODO(b/288175061): remove with Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR

    /**

     * @hide

     */

    @RequiresPermission(USE_BIOMETRIC_INTERNAL)

    public void setSidefpsController(@NonNull ISidefpsController controller) {

        if (mService == null) {

            Slog.w(TAG, "setSidefpsController: no fingerprint service");

            return;

        }



        try {

            mService.setSidefpsController(controller);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Forwards BiometricStateListener to FingerprintService

     * @param listener new BiometricStateListener being added

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.hardware.fingerprint.IFingerprintClientActiveCallback; 
import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback;

import android.hardware.fingerprint.IFingerprintServiceReceiver;

import android.hardware.fingerprint.IUdfpsOverlayController;

import android.hardware.fingerprint.ISidefpsController;

import android.hardware.fingerprint.Fingerprint;

import android.hardware.fingerprint.FingerprintAuthenticateOptions;

import android.hardware.fingerprint.FingerprintEnrollOptions;
@@ -200,10 +199,6 @@ interface IFingerprintService { 
    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    void setUdfpsOverlayController(in IUdfpsOverlayController controller);



    // Sets the controller for managing the SideFPS overlay.

    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    void setSidefpsController(in ISidefpsController controller);



    // Registers AuthenticationStateListener.

    @EnforcePermission("USE_BIOMETRIC_INTERNAL")

    void registerAuthenticationStateListener(AuthenticationStateListener listener);

core/java/android/hardware/fingerprint/ISidefpsController.aidl

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.hardware.fingerprint;



/**

 * Interface for interacting with the side fingerprint sensor (side-fps) overlay.

 * @hide

 */

oneway interface ISidefpsController {



    // Shows the overlay for the given sensor with a reason from BiometricOverlayConstants.

    void show(int sensorId, int reason);



    // Hides the overlay.

    void hide(int sensorId);

}

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+0 −28
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
package com.android.keyguard



import android.content.res.Configuration

import android.hardware.biometrics.BiometricRequestConstants

import android.media.AudioManager

import android.telephony.TelephonyManager

import android.testing.TestableLooper.RunWithLooper
@@ -41,8 +40,6 @@ import com.android.keyguard.domain.interactor.KeyguardKeyboardInteractor 
import com.android.systemui.Flags as AConfigFlags

import com.android.systemui.SysuiTestCase

import com.android.systemui.biometrics.FaceAuthAccessibilityDelegate

import com.android.systemui.biometrics.SideFpsController

import com.android.systemui.biometrics.SideFpsUiRequestSource

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants

import com.android.systemui.classifier.FalsingA11yDelegate
@@ -70,7 +67,6 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag 
import com.android.systemui.scene.shared.model.FakeSceneDataSource

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.fakeSceneDataSource

import com.android.systemui.shared.Flags.FLAG_SIDEFPS_CONTROLLER_REFACTOR

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.statusbar.policy.DevicePostureController

import com.android.systemui.statusbar.policy.DeviceProvisionedController
@@ -87,7 +83,6 @@ import com.android.systemui.util.mockito.mock 
import com.android.systemui.util.mockito.whenever

import com.android.systemui.util.settings.GlobalSettings

import com.google.common.truth.Truth

import java.util.Optional

import junit.framework.Assert

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableStateFlow
@@ -143,7 +138,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
    @Mock private lateinit var userSwitcherController: UserSwitcherController

    @Mock private lateinit var sessionTracker: SessionTracker

    @Mock private lateinit var keyguardViewController: KeyguardViewController

    @Mock private lateinit var sideFpsController: SideFpsController

    @Mock private lateinit var keyguardPasswordViewControllerMock: KeyguardPasswordViewController

    @Mock private lateinit var falsingA11yDelegate: FalsingA11yDelegate

    @Mock private lateinit var telephonyManager: TelephonyManager
@@ -214,9 +208,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
        mSetFlagsRule.enableFlags(

            AConfigFlags.FLAG_REVAMPED_BOUNCER_MESSAGES,

        )

        mSetFlagsRule.disableFlags(

            FLAG_SIDEFPS_CONTROLLER_REFACTOR,

        )

        if (!SceneContainerFlag.isEnabled) {

            mSetFlagsRule.disableFlags(

                AConfigFlags.FLAG_KEYGUARD_WM_STATE_REFACTOR,
@@ -273,7 +264,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
                featureFlags,

                globalSettings,

                sessionTracker,

                Optional.of(sideFpsController),

                falsingA11yDelegate,

                telephonyManager,

                viewMediatorCallback,
@@ -780,24 +770,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
            .asynchronouslyInflateView(any(), any(), eq(onViewInflatedCallback))

    }



    @Test

    fun sideFpsControllerShow() {

        mSetFlagsRule.disableFlags(FLAG_SIDEFPS_CONTROLLER_REFACTOR)

        underTest.updateSideFpsVisibility(/* isVisible= */ true)

        verify(sideFpsController)

            .show(

                SideFpsUiRequestSource.PRIMARY_BOUNCER,

                BiometricRequestConstants.REASON_AUTH_KEYGUARD

            )

    }



    @Test

    fun sideFpsControllerHide() {

        mSetFlagsRule.disableFlags(FLAG_SIDEFPS_CONTROLLER_REFACTOR)

        underTest.updateSideFpsVisibility(/* isVisible= */ false)

        verify(sideFpsController).hide(SideFpsUiRequestSource.PRIMARY_BOUNCER)

    }



    @Test

    fun setExpansion_setsAlpha() {

        underTest.setExpansion(KeyguardBouncerConstants.EXPANSION_VISIBLE)

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java

+6 −10
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ public class AuthControllerTest extends SysuiTestCase { 
    @Mock

    private UdfpsController mUdfpsController;

    @Mock

    private SideFpsController mSideFpsController;

    @Mock

    private DisplayManager mDisplayManager;

    @Mock

    private WakefulnessLifecycle mWakefulnessLifecycle;
@@ -1064,14 +1062,12 @@ public class AuthControllerTest extends SysuiTestCase { 
        TestableAuthController(Context context) {

            super(context, null /* applicationCoroutineScope */,

                    mExecution, mCommandQueue, mActivityTaskManager, mWindowManager,

                    mFingerprintManager, mFaceManager, () -> mUdfpsController,

                    () -> mSideFpsController, mDisplayManager, mWakefulnessLifecycle,

                    mPanelInteractionDetector, mUserManager, mLockPatternUtils, () -> mUdfpsLogger,

                    () -> mLogContextInteractor,

                    () -> mBiometricPromptCredentialInteractor,

                    () -> mPromptSelectionInteractor, () -> mCredentialViewModel,

                    () -> mPromptViewModel, mInteractionJankMonitor, mHandler, mBackgroundExecutor,

                    mUdfpsUtils, mVibratorHelper);

                    mFingerprintManager, mFaceManager, () -> mUdfpsController, mDisplayManager,

                    mWakefulnessLifecycle, mPanelInteractionDetector, mUserManager,

                    mLockPatternUtils, () -> mUdfpsLogger, () -> mLogContextInteractor,

                    () -> mBiometricPromptCredentialInteractor, () -> mPromptSelectionInteractor,

                    () -> mCredentialViewModel, () -> mPromptViewModel, mInteractionJankMonitor,

                    mHandler, mBackgroundExecutor, mUdfpsUtils, mVibratorHelper);

        }



        @Override