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

am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

Browse Source 
* commit '6fdb85d383007e7d68895195d6347840276abeab':
  Disable fingerprint when remotely reset by DPM
This commit is contained in:
Jim Miller
2015-08-06 01:57:54 +00:00
committed by Android Git Automerger
parent 7be1e28641 6fdb85d383
commit 5f96eb0caf
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

@@ -557,6 +557,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
if (DEBUG) Log.d(TAG, "received broadcast " + action);
@@ -610,6 +611,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
private final BroadcastReceiver mBroadcastAllReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
if (AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED.equals(action)) {
@@ -724,6 +726,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
return new SimData(state, slotId, subId);
}
@Override
public String toString() {
return "SimData{state=" + simState + ",slotId=" + slotId + ",subId=" + subId + "}";
}
@@ -939,7 +942,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
}
private boolean shouldListenForFingerprint() {
return mKeyguardIsVisible && !mSwitchingUser;
return mKeyguardIsVisible && !mSwitchingUser &&
mTrustManager.hasUserAuthenticatedSinceBoot(
ActivityManager.getCurrentUser());
}
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) {
if (userId == UserHandle.USER_ALL) {
mUserHasAuthenticated.clear();
synchronized (mUserHasAuthenticatedSinceBoot) {
mUserHasAuthenticatedSinceBoot.clear();
}
} else {
mUserHasAuthenticated.put(userId, false);
synchronized (mUserHasAuthenticatedSinceBoot) {
mUserHasAuthenticatedSinceBoot.put(userId, false);
}
}
}