commit 86dad492291ef3bb5fc04c41586f9f4af73987cc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jul 09 11:53:22 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 09 11:53:22 2024 +0000
tree b4e733654676b292d39ce495b948f7fab40fbdcc
parent 3f0f535141f7262da2444c948fa96f350ab35595
parent 5fb01f1f44a7f271df645c8c0234effd96c79bc4

Merge "Fix malformed trace section" into main

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 1ea5d1c..fe81b20c 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 @@
         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();
     }