summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter Kalauskas <peskal@google.com> 2024-07-08 18:35:03 -0700
committer Peter Kalauskas <peskal@google.com> 2024-07-08 18:43:30 -0700
commit5fb01f1f44a7f271df645c8c0234effd96c79bc4 (patch)
treeb35cc1df55279841a0e7ef065c1ba7d00001dcd6
parentb283f3d313904f0623e979e301a90634e1a01215 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java12
1 files 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();
}