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

Commit df66e0cf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SysUI co-ex updates" into sc-dev am: c4828692 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312413

Change-Id: I48cff08d286e06adb696853c981f0e2a90cedc44
parents acc6e12a c4828692

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

+32 −22
Original line number Diff line number Diff line
@@ -1431,6 +1431,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                @Override

                public void onAuthenticationFailed() {

                    handleFaceAuthFailed();

                    if (mKeyguardBypassController != null) {

                        mKeyguardBypassController.setUserHasDeviceEntryIntent(false);

                    }

                }



                @Override
@@ -1438,6 +1441,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                    Trace.beginSection("KeyguardUpdateMonitor#onAuthenticationSucceeded");

                    handleFaceAuthenticated(result.getUserId(), result.isStrongBiometric());

                    Trace.endSection();



                    if (mKeyguardBypassController != null) {

                        mKeyguardBypassController.setUserHasDeviceEntryIntent(false);

                    }

                }



                @Override
@@ -1448,6 +1455,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                @Override

                public void onAuthenticationError(int errMsgId, CharSequence errString) {

                    handleFaceError(errMsgId, errString.toString());

                    if (mKeyguardBypassController != null) {

                        mKeyguardBypassController.setUserHasDeviceEntryIntent(false);

                    }

                }



                @Override

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+24 −8
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import com.android.systemui.keyguard.ScreenLifecycle; 
import com.android.systemui.plugins.FalsingManager;

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

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -120,6 +121,7 @@ public class UdfpsController implements DozeReceiver { 
    @NonNull private final AccessibilityManager mAccessibilityManager;

    @NonNull private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;

    @Nullable private final UdfpsHbmProvider mHbmProvider;

    @NonNull private final KeyguardBypassController mKeyguardBypassController;

    @VisibleForTesting @NonNull final BiometricOrientationEventListener mOrientationListener;

    // Currently the UdfpsController supports a single UDFPS sensor. If devices have multiple

    // sensors, this, in addition to a lot of the code here, will be updated.
@@ -397,7 +399,10 @@ public class UdfpsController implements DozeReceiver { 
                    handled = true;

                }

                if ((withinSensorArea || fromUdfpsView) && shouldTryToDismissKeyguard()) {

                    Log.v(TAG, "onTouch | dismiss keyguard from ACTION_DOWN");

                    Log.v(TAG, "onTouch | dismiss keyguard ACTION_DOWN");

                    if (!mOnFingerDown) {

                        playStartHaptic();

                    }

                    mKeyguardViewManager.notifyKeyguardAuthenticated(false /* strongAuth */);

                    mAttemptedToDismissKeyguard = true;

                }
@@ -414,6 +419,16 @@ public class UdfpsController implements DozeReceiver { 
                    boolean actionMoveWithinSensorArea =

                            isWithinSensorArea(udfpsView, event.getX(idx), event.getY(idx),

                                fromUdfpsView);

                    if ((fromUdfpsView || actionMoveWithinSensorArea)

                            && shouldTryToDismissKeyguard()) {

                        Log.v(TAG, "onTouch | dismiss keyguard ACTION_MOVE");

                        if (!mOnFingerDown) {

                            playStartHaptic();

                        }

                        mKeyguardViewManager.notifyKeyguardAuthenticated(false /* strongAuth */);

                        mAttemptedToDismissKeyguard = true;

                        break;

                    }

                    if (actionMoveWithinSensorArea) {

                        if (mVelocityTracker == null) {

                            // touches could be injected, so the velocity tracker may not have
@@ -449,12 +464,6 @@ public class UdfpsController implements DozeReceiver { 
                        Log.v(TAG, "onTouch | finger outside");

                        onFingerUp();

                    }

                    if ((fromUdfpsView || actionMoveWithinSensorArea)

                            && shouldTryToDismissKeyguard()) {

                        Log.v(TAG, "onTouch | dismiss keyguard from ACTION_MOVE");

                        mKeyguardViewManager.notifyKeyguardAuthenticated(false /* strongAuth */);

                        mAttemptedToDismissKeyguard = true;

                    }

                }

                Trace.endSection();

                break;
@@ -509,7 +518,8 @@ public class UdfpsController implements DozeReceiver { 
            @Nullable Vibrator vibrator,

            @NonNull UdfpsHapticsSimulator udfpsHapticsSimulator,

            @NonNull Optional<UdfpsHbmProvider> hbmProvider,

            @NonNull KeyguardStateController keyguardStateController) {

            @NonNull KeyguardStateController keyguardStateController,

            @NonNull KeyguardBypassController keyguardBypassController) {

        mContext = context;

        mExecution = execution;

        // TODO (b/185124905): inject main handler and vibrator once done prototyping
@@ -539,6 +549,7 @@ public class UdfpsController implements DozeReceiver { 
            onOrientationChanged();

            return Unit.INSTANCE;

        });

        mKeyguardBypassController = keyguardBypassController;



        mSensorProps = findFirstUdfps();

        // At least one UDFPS sensor exists
@@ -863,12 +874,17 @@ public class UdfpsController implements DozeReceiver { 


    private void onFingerDown(int x, int y, float minor, float major) {

        mExecution.assertIsMainThread();

        mKeyguardBypassController.setUserHasDeviceEntryIntent(true);

        if (mView == null) {

            Log.w(TAG, "Null view in onFingerDown");

            return;

        }

        if (!mOnFingerDown) {

            playStartHaptic();



            if (!mKeyguardUpdateMonitor.isFaceDetectionRunning()) {

                mKeyguardUpdateMonitor.requestFaceAuth(/* userInitiatedRequest */ false);

            }

        }

        mOnFingerDown = true;

        mFingerprintManager.onPointerDown(mSensorProps.sensorId, x, y, minor, major);

packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java

+2 −2
Original line number Diff line number Diff line
@@ -564,8 +564,8 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
        boolean unlockingAllowed =

                mUpdateMonitor.isUnlockingWithBiometricAllowed(isStrongBiometric);

        boolean deviceDreaming = mUpdateMonitor.isDreaming();

        boolean bypass = mKeyguardBypassController.getBypassEnabled();



        boolean bypass = mKeyguardBypassController.getBypassEnabled()

                || mKeyguardBypassController.getUserHasDeviceEntryIntent();

        if (!mUpdateMonitor.isDeviceInteractive()) {

            if (!mKeyguardViewController.isShowing()) {

                return bypass ? MODE_WAKE_AND_UNLOCK : MODE_ONLY_WAKE;

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr 
    @BypassOverride private val bypassOverride: Int

    private var hasFaceFeature: Boolean

    private var pendingUnlock: PendingUnlock? = null

    var userHasDeviceEntryIntent: Boolean = false // ie: attempted udfps auth



    @IntDef(

        FACE_UNLOCK_BYPASS_NO_OVERRIDE,

packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+5 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.systemui.keyguard.ScreenLifecycle; 
import com.android.systemui.plugins.FalsingManager;

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

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -136,6 +137,8 @@ public class UdfpsControllerTest extends SysuiTestCase { 
    private UdfpsHapticsSimulator mUdfpsHapticsSimulator;

    @Mock

    private KeyguardStateController mKeyguardStateController;

    @Mock

    private KeyguardBypassController mKeyguardBypassController;



    private FakeExecutor mFgExecutor;
@@ -204,7 +207,8 @@ public class UdfpsControllerTest extends SysuiTestCase { 
                mVibrator,

                mUdfpsHapticsSimulator,

                Optional.of(mHbmProvider),

                mKeyguardStateController);

                mKeyguardStateController,

                mKeyguardBypassController);

        verify(mFingerprintManager).setUdfpsOverlayController(mOverlayCaptor.capture());

        mOverlayController = mOverlayCaptor.getValue();

        verify(mScreenLifecycle).addObserver(mScreenObserverCaptor.capture());