Merge "Log keyguard transitions after biometrics" into rvc-dev (a5f7670b) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -589,7 +589,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
		if (targetUserId != ActivityManager.getCurrentUser()) {
		return;
		}

		if (DEBUG) Log.d(TAG, "keyguardDone");
		tryKeyguardDone();
		}

		@@ -608,6 +608,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
		@Override
		public void keyguardDonePending(boolean strongAuth, int targetUserId) {
		Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending");
		if (DEBUG) Log.d(TAG, "keyguardDonePending");
		if (targetUserId != ActivityManager.getCurrentUser()) {
		Trace.endSection();
		return;
		@@ -626,6 +627,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
		@Override
		public void keyguardGone() {
		Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardGone");
		if (DEBUG) Log.d(TAG, "keyguardGone");
		mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false);
		mKeyguardDisplayManager.hide();
		Trace.endSection();
		@@ -1690,9 +1692,14 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
		};

		private void tryKeyguardDone() {
		if (DEBUG) {
		Log.d(TAG, "tryKeyguardDone: pending - " + mKeyguardDonePending + ", animRan - "
		+ mHideAnimationRun + " animRunning - " + mHideAnimationRunning);
		}
		if (!mKeyguardDonePending && mHideAnimationRun && !mHideAnimationRunning) {
		handleKeyguardDone();
		} else if (!mHideAnimationRun) {
		if (DEBUG) Log.d(TAG, "tryKeyguardDone: starting pre-hide animation");
		mHideAnimationRun = true;
		mHideAnimationRunning = true;
		mKeyguardViewControllerLazy.get()
		@@ -1919,6 +1926,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
		};

		private final Runnable mHideAnimationFinishedRunnable = () -> {
		Log.e(TAG, "mHideAnimationFinishedRunnable#run");
		mHideAnimationRunning = false;
		tryKeyguardDone();
		};

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.Log;
		import android.util.MathUtils;
		import android.util.Slog;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -169,7 +168,7 @@ public class KeyguardBouncer {

		// This condition may indicate an error on Android, so log it.
		if (!allowDismissKeyguard) {
		Slog.w(TAG, "User can't dismiss keyguard: " + activeUserId + " != " + keyguardUserId);
		Log.w(TAG, "User can't dismiss keyguard: " + activeUserId + " != " + keyguardUserId);
		}

		mShowingSoon = true;