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

am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev

Browse Source 
* commit '33a5c80773b7b2913c92fec170787499a453d184':
  Revert "Disable fingerprint when remotely reset by DPM"
This commit is contained in:
Jim Miller
2015-08-18 20:15:10 +00:00
committed by Android Git Automerger
parent 9b1fd822d0 33a5c80773
commit e11fbc08a3
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,7 +611,6 @@ 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);
@@ -665,7 +664,6 @@ 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)) {
@@ -791,7 +789,6 @@ 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 + "}";
} }

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

@@ -579,14 +579,8 @@ 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);
}
} }
} }