Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib4138eb8245a816fc7219582ba7e1021c46e0b71
This commit is contained in:
Kevin Chyn
2021-07-13 01:01:02 +00:00
committed by Automerger Merge Worker
parent dfd3c926ab 09cb5879a1
commit 66c82ac990
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.biometrics; 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 android.os.VibrationEffect.Composition.PRIMITIVE_LOW_TICK;
import static com.android.internal.util.Preconditions.checkArgument; import static com.android.internal.util.Preconditions.checkArgument;
@@ -317,8 +318,10 @@ public class UdfpsController implements DozeReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (mServerRequest != null if (mServerRequest != null
&& mServerRequest.mRequestReason != REASON_AUTH_FPM_KEYGUARD
&& Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { && 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.onUserCanceled();
mServerRequest = null; mServerRequest = null;
updateOverlay(); updateOverlay();