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

Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

Browse Source
This commit is contained in:
Jim Miller
2015-08-05 22:47:57 +00:00
committed by Android (Google) Code Review
parent f0affc6d46 8ae1be1208
commit 120fc2c74e
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -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() {

6
services/core/java/com/android/server/trust/TrustManagerService.java
View File

@@ -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);
}
} }
} }