From ff8025b4de3506b3e433ace4c08defeba8128a5a Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Tue, 30 Aug 2022 22:36:25 +0000 Subject: [PATCH] Log reason for ACTION_CLOSE_SYSTEM_DIALOGS Bug: 244639932 Test: N/A Change-Id: Ic0206e0b08ec06961340cf7c866b3accfaad178f --- .../com/android/systemui/biometrics/AuthController.java | 5 ++++- .../com/android/systemui/biometrics/UdfpsController.java | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index 47ff59cfc2815..aee1aabc5dbcb 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -181,7 +181,10 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba public void onReceive(Context context, Intent intent) { if (mCurrentDialog != null && Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { - Log.w(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received"); + String reason = intent.getStringExtra("reason"); + reason = (reason != null) ? reason : "unknown"; + Log.d(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received, reason: " + reason); + mCurrentDialog.dismissWithoutCallback(true /* animate */); mCurrentDialog = null; mOrientationListener.disable(); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index d1589b23454da..b787cfe25b745 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -348,8 +348,11 @@ public class UdfpsController implements DozeReceiver { if (mOverlay != null && mOverlay.getRequestReason() != REASON_AUTH_KEYGUARD && Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { - Log.d(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received, mRequestReason: " - + mOverlay.getRequestReason()); + String reason = intent.getStringExtra("reason"); + reason = (reason != null) ? reason : "unknown"; + Log.d(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received, reason: " + reason + + ", mRequestReason: " + mOverlay.getRequestReason()); + mOverlay.cancel(); hideUdfpsOverlay(); }