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

Commit deb05070 authored by Jim Miller's avatar Jim Miller
Browse files

Revert "Disable fingerprint when remotely reset by DPM" 

This reverts commit 8ae1be12.

Fixes bug 23187090

Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2
parent 8ae1be12

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

+1 −6
Original line number Diff line number Diff line
@@ -548,7 +548,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);
@@ -600,7 +599,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)) {
@@ -715,7 +713,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 + "}";

        }
@@ -898,9 +895,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    }



    private boolean shouldListenForFingerprint() {

        return mKeyguardIsVisible && !mSwitchingUser &&

                mTrustManager.hasUserAuthenticatedSinceBoot(

                        ActivityManager.getCurrentUser());

        return mKeyguardIsVisible && !mSwitchingUser;

    }



    private void startListeningForFingerprint() {

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

            }

        }

    }