Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev (120fc2c7) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -548,6 +548,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {

	private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {		private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {

			@Override
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
	final String action = intent.getAction();		final String action = intent.getAction();
	if (DEBUG) Log.d(TAG, "received broadcast " + action);		if (DEBUG) Log.d(TAG, "received broadcast " + action);
	@@ -599,6 +600,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {

	private final BroadcastReceiver mBroadcastAllReceiver = new BroadcastReceiver() {		private final BroadcastReceiver mBroadcastAllReceiver = new BroadcastReceiver() {

			@Override
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
	final String action = intent.getAction();		final String action = intent.getAction();
	if (AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED.equals(action)) {		if (AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED.equals(action)) {
	@@ -713,6 +715,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
	return new SimData(state, slotId, subId);		return new SimData(state, slotId, subId);
	}		}

			@Override
	public String toString() {		public String toString() {
	return "SimData{state=" + simState + ",slotId=" + slotId + ",subId=" + subId + "}";		return "SimData{state=" + simState + ",slotId=" + slotId + ",subId=" + subId + "}";
	}		}
	@@ -895,7 +898,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
	}		}

	private boolean shouldListenForFingerprint() {		private boolean shouldListenForFingerprint() {
	return mKeyguardIsVisible && !mSwitchingUser;		return mKeyguardIsVisible && !mSwitchingUser &&
			mTrustManager.hasUserAuthenticatedSinceBoot(
			ActivityManager.getCurrentUser());
	}		}

	private void startListeningForFingerprint() {		private void startListeningForFingerprint() {

services/core/java/com/android/server/trust/TrustManagerService.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -579,8 +579,14 @@ public class TrustManagerService extends SystemService {
	private void clearUserHasAuthenticated(int userId) {		private void clearUserHasAuthenticated(int userId) {
	if (userId == UserHandle.USER_ALL) {		if (userId == UserHandle.USER_ALL) {
	mUserHasAuthenticated.clear();		mUserHasAuthenticated.clear();
			synchronized (mUserHasAuthenticatedSinceBoot) {
			mUserHasAuthenticatedSinceBoot.clear();
			}
	} else {		} else {
	mUserHasAuthenticated.put(userId, false);		mUserHasAuthenticated.put(userId, false);
			synchronized (mUserHasAuthenticatedSinceBoot) {
			mUserHasAuthenticatedSinceBoot.put(userId, false);
			}
	}		}
	}		}