Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10fe83a9 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for... 

am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev

* commit '8978d9ac':
  Revert "Disable fingerprint when remotely reset by DPM"
parents 4080a419 8978d9ac

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

+0 −3
Original line number Diff line number Diff line
@@ -611,7 +611,6 @@ 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);
@@ -665,7 +664,6 @@ 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)) {
@@ -791,7 +789,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
            return new SimData(state, slotId, subId);

        }



        @Override

        public String toString() {

            return "SimData{state=" + simState + ",slotId=" + slotId + ",subId=" + subId + "}";

        }

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

+0 −6
Original line number Diff line number Diff line
@@ -579,14 +579,8 @@ 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);

            }

        }

    }