Merge changes I40acd41d,I3bc15180 into tm-qpr-dev (f16bc97e) · Commits · e / os / android_frameworks_base

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

+15 −72

Original line number	Diff line number	Diff line
		@@ -342,12 +342,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		*/
		private int mDelayedProfileShowingSequence;

		/**
		* If the user has disabled the keyguard, then requests to exit, this is
		* how we'll ultimately let them know whether it was successful. We use this
		* var being non-null as an indicator that there is an in progress request.
		*/
		private IKeyguardExitCallback mExitSecureCallback;
		private final DismissCallbackRegistry mDismissCallbackRegistry;

		// the properties of the keyguard
		@@ -1341,18 +1335,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		\|\| !mLockPatternUtils.isSecure(currentUser);
		long timeout = getLockTimeout(KeyguardUpdateMonitor.getCurrentUser());
		mLockLater = false;
		if (mExitSecureCallback != null) {
		if (DEBUG) Log.d(TAG, "pending exit secure callback cancelled");
		try {
		mExitSecureCallback.onKeyguardExitResult(false);
		} catch (RemoteException e) {
		Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
		}
		mExitSecureCallback = null;
		if (!mExternallyEnabled) {
		hideLocked();
		}
		} else if (mShowing && !mKeyguardStateController.isKeyguardGoingAway()) {
		if (mShowing && !mKeyguardStateController.isKeyguardGoingAway()) {
		// If we are going to sleep but the keyguard is showing (and will continue to be
		// showing, not in the process of going away) then reset its state. Otherwise, let
		// this fall through and explicitly re-lock the keyguard.
		@@ -1671,13 +1654,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		mExternallyEnabled = enabled;

		if (!enabled && mShowing) {
		if (mExitSecureCallback != null) {
		if (DEBUG) Log.d(TAG, "in process of verifyUnlock request, ignoring");
		// we're in the process of handling a request to verify the user
		// can get past the keyguard. ignore extraneous requests to disable / re-enable
		return;
		}

		// hiding keyguard that is showing, remember to reshow later
		if (DEBUG) Log.d(TAG, "remembering to reshow, hiding keyguard, "
		+ "disabling status bar expansion");
		@@ -1691,23 +1667,14 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		mNeedToReshowWhenReenabled = false;
		updateInputRestrictedLocked();

		if (mExitSecureCallback != null) {
		if (DEBUG) Log.d(TAG, "onKeyguardExitResult(false), resetting");
		try {
		mExitSecureCallback.onKeyguardExitResult(false);
		} catch (RemoteException e) {
		Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
		}
		mExitSecureCallback = null;
		resetStateLocked();
		} else {
		showLocked(null);

		// block until we know the keyguard is done drawing (and post a message
		// to unblock us after a timeout, so we don't risk blocking too long
		// and causing an ANR).
		mWaitingUntilKeyguardVisible = true;
		mHandler.sendEmptyMessageDelayed(KEYGUARD_DONE_DRAWING, KEYGUARD_DONE_DRAWING_TIMEOUT_MS);
		mHandler.sendEmptyMessageDelayed(KEYGUARD_DONE_DRAWING,
		KEYGUARD_DONE_DRAWING_TIMEOUT_MS);
		if (DEBUG) Log.d(TAG, "waiting until mWaitingUntilKeyguardVisible is false");
		while (mWaitingUntilKeyguardVisible) {
		try {
		@@ -1720,7 +1687,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		}
		}
		}
		}

		/**
		* @see android.app.KeyguardManager#exitKeyguardSecurely
		@@ -1747,13 +1713,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		} catch (RemoteException e) {
		Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
		}
		} else if (mExitSecureCallback != null) {
		// already in progress with someone else
		try {
		callback.onKeyguardExitResult(false);
		} catch (RemoteException e) {
		Slog.w(TAG, "Failed to call onKeyguardExitResult(false)", e);
		}
		} else if (!isSecure()) {

		// Keyguard is not secure, no need to do anything, and we don't need to reshow
		@@ -2294,21 +2253,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		return;
		}
		setPendingLock(false); // user may have authenticated during the screen off animation
		if (mExitSecureCallback != null) {
		try {
		mExitSecureCallback.onKeyguardExitResult(true /* authenciated */);
		} catch (RemoteException e) {
		Slog.w(TAG, "Failed to call onKeyguardExitResult()", e);
		}

		mExitSecureCallback = null;

		// after successfully exiting securely, no need to reshow
		// the keyguard when they've released the lock
		mExternallyEnabled = true;
		mNeedToReshowWhenReenabled = false;
		updateInputRestricted();
		}

		handleHide();
		mUpdateMonitor.clearBiometricRecognizedWhenKeyguardDone(currentUser);
		@@ -3117,7 +3061,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		pw.print(" mInputRestricted: "); pw.println(mInputRestricted);
		pw.print(" mOccluded: "); pw.println(mOccluded);
		pw.print(" mDelayedShowingSequence: "); pw.println(mDelayedShowingSequence);
		pw.print(" mExitSecureCallback: "); pw.println(mExitSecureCallback);
		pw.print(" mDeviceInteractive: "); pw.println(mDeviceInteractive);
		pw.print(" mGoingToSleep: "); pw.println(mGoingToSleep);
		pw.print(" mHiding: "); pw.println(mHiding);

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt

+25 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.animation.AnimatorListenerAdapter
		import android.animation.ValueAnimator
		import android.animation.ValueAnimator.AnimatorUpdateListener
		import android.annotation.FloatRange
		import android.os.Trace
		import android.util.Log
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.shared.model.KeyguardState
		@@ -157,12 +158,36 @@ class KeyguardTransitionRepository @Inject constructor() {
		value: Float,
		transitionState: TransitionState
		) {
		trace(info, transitionState)

		if (transitionState == TransitionState.FINISHED) {
		currentTransitionInfo = null
		}
		_transitions.value = TransitionStep(info.from, info.to, value, transitionState)
		}

		private fun trace(info: TransitionInfo, transitionState: TransitionState) {
		if (
		transitionState != TransitionState.STARTED &&
		transitionState != TransitionState.FINISHED
		) {
		return
		}
		val traceName =
		"Transition: ${info.from} -> ${info.to} " +
		if (info.animator == null) {
		"(manual)"
		} else {
		""
		}
		val traceCookie = traceName.hashCode()
		if (transitionState == TransitionState.STARTED) {
		Trace.beginAsyncSection(traceName, traceCookie)
		} else if (transitionState == TransitionState.FINISHED) {
		Trace.endAsyncSection(traceName, traceCookie)
		}
		}

		companion object {
		private const val TAG = "KeyguardTransitionRepository"
		}