Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev (c6e9bb9d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+33 −5

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import android.media.AudioManager;
		import android.os.BatteryManager;
		import android.os.CancellationSignal;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.IRemoteCallback;
		import android.os.Message;
		import android.os.RemoteException;
		@@ -58,6 +59,8 @@ import android.os.Trace;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.service.dreams.DreamService;
		import android.service.dreams.IDreamManager;
		import android.telephony.ServiceState;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		@@ -67,8 +70,6 @@ import android.util.Log;
		import android.util.SparseBooleanArray;
		import android.util.SparseIntArray;

		import com.google.android.collect.Lists;

		import com.android.internal.telephony.IccCardConstants;
		import com.android.internal.telephony.IccCardConstants.State;
		import com.android.internal.telephony.PhoneConstants;
		@@ -77,6 +78,8 @@ import com.android.internal.widget.LockPatternUtils;
		import com.android.systemui.recents.misc.SystemServicesProxy;
		import com.android.systemui.recents.misc.SystemServicesProxy.TaskStackListener;

		import com.google.android.collect.Lists;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		@@ -217,6 +220,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		private UserManager mUserManager;
		private int mFingerprintRunningState = FINGERPRINT_STATE_STOPPED;
		private LockPatternUtils mLockPatternUtils;
		private final IDreamManager mDreamManager;
		private boolean mIsDreaming;

		/**
		* Short delay before restarting fingerprint authentication after a successful try
		@@ -458,6 +463,26 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		updateFingerprintListeningState();
		}

		/**
		* @return a cached version of DreamManager.isDreaming()
		*/
		public boolean isDreaming() {
		return mIsDreaming;
		}

		/**
		* If the device is dreaming, awakens the device
		*/
		public void awakenFromDream() {
		if (mIsDreaming && mDreamManager != null) {
		try {
		mDreamManager.awaken();
		} catch (RemoteException e) {
		Log.e(TAG, "Unable to awaken from dream");
		}
		}
		}

		private void onFingerprintAuthenticated(int userId) {
		Trace.beginSection("KeyGuardUpdateMonitor#onFingerPrintAuthenticated");
		mUserFingerprintAuthenticated.put(userId, true);
		@@ -1037,11 +1062,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {

		private void handleDreamingStateChanged(int dreamStart) {
		final int count = mCallbacks.size();
		boolean showingDream = dreamStart == 1;
		mIsDreaming = dreamStart == 1;
		for (int i = 0; i < count; i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		if (cb != null) {
		cb.onDreamingStateChanged(showingDream);
		cb.onDreamingStateChanged(mIsDreaming);
		}
		}
		}
		@@ -1146,6 +1171,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		mLockPatternUtils = new LockPatternUtils(context);
		mLockPatternUtils.registerStrongAuthTracker(mStrongAuthTracker);

		mDreamManager = IDreamManager.Stub.asInterface(
		ServiceManager.getService(DreamService.DREAM_SERVICE));

		if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
		mFpm = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
		}
		@@ -1183,7 +1211,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		private boolean shouldListenForFingerprint() {
		return (mKeyguardIsVisible \|\| !mDeviceInteractive \|\|
		(mBouncer && !mKeyguardGoingAway) \|\| mGoingToSleep \|\|
		shouldListenForFingerprintAssistant())
		shouldListenForFingerprintAssistant() \|\| (mKeyguardOccluded && mIsDreaming))
		&& !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())
		&& !mKeyguardGoingAway;
		}

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

+14 −2

Original line number	Diff line number	Diff line
		@@ -84,6 +84,11 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
		*/
		public static final int MODE_DISMISS_BOUNCER = 6;

		/**
		* Mode in which fingerprint wakes and unlocks the device from a dream.
		*/
		public static final int MODE_WAKE_AND_UNLOCK_FROM_DREAM = 7;

		/**
		* How much faster we collapse the lockscreen when authenticating with fingerprint.
		*/
		@@ -230,16 +235,19 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
		}
		Trace.endSection();
		break;
		case MODE_WAKE_AND_UNLOCK_FROM_DREAM:
		case MODE_WAKE_AND_UNLOCK_PULSING:
		case MODE_WAKE_AND_UNLOCK:
		if (mMode == MODE_WAKE_AND_UNLOCK_PULSING) {
		Trace.beginSection("MODE_WAKE_AND_UNLOCK_PULSING");
		mStatusBar.updateMediaMetaData(false /* metaDataChanged */,
		true /* allowEnterAnimation */);
		} else {
		} else if (mMode == MODE_WAKE_AND_UNLOCK){
		Trace.beginSection("MODE_WAKE_AND_UNLOCK");

		mDozeScrimController.abortDoze();
		} else {
		Trace.beginSection("MODE_WAKE_AND_UNLOCK_FROM_DREAM");
		mUpdateMonitor.awakenFromDream();
		}
		mStatusBarWindowManager.setStatusBarFocusable(false);
		mKeyguardViewMediator.onWakeAndUnlocking();
		@@ -299,6 +307,7 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {

		private int calculateMode() {
		boolean unlockingAllowed = mUpdateMonitor.isUnlockingWithFingerprintAllowed();
		boolean deviceDreaming = mUpdateMonitor.isDreaming();

		if (!mUpdateMonitor.isDeviceInteractive()) {
		if (!mStatusBarKeyguardViewManager.isShowing()) {
		@@ -311,6 +320,9 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
		return MODE_SHOW_BOUNCER;
		}
		}
		if (unlockingAllowed && deviceDreaming) {
		return MODE_WAKE_AND_UNLOCK_FROM_DREAM;
		}
		if (mStatusBarKeyguardViewManager.isShowing()) {
		if (mStatusBarKeyguardViewManager.isBouncerShowing() && unlockingAllowed) {
		return MODE_DISMISS_BOUNCER;