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

Commit 8f569191 authored Sep 20, 2022 by TreeHugger Robot Committed by Android (Google) Code Review Sep 20, 2022

Merge "Log reason for ACTION_CLOSE_SYSTEM_DIALOGS" into tm-qpr-dev

parents 24fdd1fc ff8025b4

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,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;

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -342,8 +342,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();
		}