From 5fb01f1f44a7f271df645c8c0234effd96c79bc4 Mon Sep 17 00:00:00 2001 From: Peter Kalauskas Date: Mon, 8 Jul 2024 18:35:03 -0700 Subject: Fix malformed trace section In some scenarios, the trace section KeyguardViewMediator#handleKeyguardDone would never close. Test: Capture perfetto trace, inspect trace to verify all slices end Flag: EXEMPT system tracing only Change-Id: Ic75a0bbf8efb0f2b045a96a7b4a0896a2451fc90 --- .../com/android/systemui/keyguard/KeyguardViewMediator.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 1ea5d1c00561..fe81b20c5367 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -2722,13 +2722,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, if (mGoingToSleep) { mUpdateMonitor.clearFingerprintRecognizedWhenKeyguardDone(currentUser); Log.i(TAG, "Device is going to sleep, aborting keyguardDone"); - return; - } - setPendingLock(false); // user may have authenticated during the screen off animation + } else { + setPendingLock(false); // user may have authenticated during the screen off animation - handleHide(); - mKeyguardInteractor.keyguardDoneAnimationsFinished(); - mUpdateMonitor.clearFingerprintRecognizedWhenKeyguardDone(currentUser); + handleHide(); + mKeyguardInteractor.keyguardDoneAnimationsFinished(); + mUpdateMonitor.clearFingerprintRecognizedWhenKeyguardDone(currentUser); + } Trace.endSection(); } -- cgit v1.2.3-59-g8ed1b