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

Merge "Log keyguard transitions after biometrics" into rvc-dev am: a5f7670b4c am: 299d544b66

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

Change-Id: I3bad0c40cb4d1a75a5b6c7a16945f57296f0b570
This commit is contained in:
TreeHugger Robot
2020-07-01 22:03:03 +00:00
committed by Automerger Merge Worker
parent f017cf3dff 299d544b66
commit 5fa65476b9
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -589,7 +589,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
if (targetUserId != ActivityManager.getCurrentUser()) { if (targetUserId != ActivityManager.getCurrentUser()) {
return; return;
} }
if (DEBUG) Log.d(TAG, "keyguardDone");
tryKeyguardDone(); tryKeyguardDone();
} }
@@ -608,6 +608,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
@Override @Override
public void keyguardDonePending(boolean strongAuth, int targetUserId) { public void keyguardDonePending(boolean strongAuth, int targetUserId) {
Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending"); Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending");
if (DEBUG) Log.d(TAG, "keyguardDonePending");
if (targetUserId != ActivityManager.getCurrentUser()) { if (targetUserId != ActivityManager.getCurrentUser()) {
Trace.endSection(); Trace.endSection();
return; return;
@@ -626,6 +627,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
@Override @Override
public void keyguardGone() { public void keyguardGone() {
Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone"); Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone");
if (DEBUG) Log.d(TAG, "keyguardGone");
mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false); mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
mKeyguardDisplayManager.hide(); mKeyguardDisplayManager.hide();
Trace.endSection(); Trace.endSection();
@@ -1690,9 +1692,14 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
}; };
private void tryKeyguardDone() { private void tryKeyguardDone() {
if (DEBUG) {
Log.d(TAG, "tryKeyguardDone: pending - " + mKeyguardDonePending + ", animRan - "
+ mHideAnimationRun + " animRunning - " + mHideAnimationRunning);
}
if (!mKeyguardDonePending && mHideAnimationRun && !mHideAnimationRunning) { if (!mKeyguardDonePending && mHideAnimationRun && !mHideAnimationRunning) {
handleKeyguardDone(); handleKeyguardDone();
} else if (!mHideAnimationRun) { } else if (!mHideAnimationRun) {
if (DEBUG) Log.d(TAG, "tryKeyguardDone: starting pre-hide animation");
mHideAnimationRun = true; mHideAnimationRun = true;
mHideAnimationRunning = true; mHideAnimationRunning = true;
mKeyguardViewControllerLazy.get() mKeyguardViewControllerLazy.get()
@@ -1919,6 +1926,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
}; };
private final Runnable mHideAnimationFinishedRunnable = () -> { private final Runnable mHideAnimationFinishedRunnable = () -> {
Log.e(TAG, "mHideAnimationFinishedRunnable#run");
mHideAnimationRunning = false; mHideAnimationRunning = false;
tryKeyguardDone(); tryKeyguardDone();
}; };

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
View File

@@ -26,7 +26,6 @@ import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
import android.util.MathUtils; import android.util.MathUtils;
import android.util.Slog;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -169,7 +168,7 @@ public class KeyguardBouncer {
// This condition may indicate an error on Android, so log it. // This condition may indicate an error on Android, so log it.
if (!allowDismissKeyguard) { if (!allowDismissKeyguard) {
Slog.w(TAG, "User can't dismiss keyguard: " + activeUserId + " != " + keyguardUserId); Log.w(TAG, "User can't dismiss keyguard: " + activeUserId + " != " + keyguardUserId);
} }
mShowingSoon = true; mShowingSoon = true;