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

Merge "Log reason for ACTION_CLOSE_SYSTEM_DIALOGS" into tm-qpr-dev am: 8f56919156

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

Change-Id: Iaebe91041e04bd6fd361e801eb341f37df7003a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-21 21:32:52 +00:00
committed by Automerger Merge Worker
parent 307f07e4b4 8f56919156
commit e2a7ad8f83
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,7 +191,10 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (mCurrentDialog != null if (mCurrentDialog != null
&& Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { && 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.dismissWithoutCallback(true /* animate */);
mCurrentDialog = null; mCurrentDialog = null;

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

@@ -342,8 +342,11 @@ public class UdfpsController implements DozeReceiver {
if (mOverlay != null if (mOverlay != null
&& mOverlay.getRequestReason() != REASON_AUTH_KEYGUARD && mOverlay.getRequestReason() != REASON_AUTH_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, mRequestReason: " String reason = intent.getStringExtra("reason");
+ mOverlay.getRequestReason()); reason = (reason != null) ? reason : "unknown";
Log.d(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received, reason: " + reason
+ ", mRequestReason: " + mOverlay.getRequestReason());
mOverlay.cancel(); mOverlay.cancel();
hideUdfpsOverlay(); hideUdfpsOverlay();
} }