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

Commit 49ffbfd2 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Do not respond to ACSD if authing for keyguard" into sc-dev am: 09cb5879 

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

Change-Id: I3370c08274267bb5c35e09f3428638309a1af40d
parents 0e619ec7 09cb5879

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

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.biometrics;



import static android.hardware.fingerprint.IUdfpsOverlayController.REASON_AUTH_FPM_KEYGUARD;

import static android.os.VibrationEffect.Composition.PRIMITIVE_LOW_TICK;



import static com.android.internal.util.Preconditions.checkArgument;
@@ -317,8 +318,10 @@ public class UdfpsController implements DozeReceiver { 
        @Override

        public void onReceive(Context context, Intent intent) {

            if (mServerRequest != null

                    && mServerRequest.mRequestReason != REASON_AUTH_FPM_KEYGUARD

                    && Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {

                Log.d(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received");

                Log.d(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received, mRequestReason: "

                        + mServerRequest.mRequestReason);

                mServerRequest.onUserCanceled();

                mServerRequest = null;

                updateOverlay();