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

Commit a2feb80b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Strong auth timeout refactor"

parents 773dedda e71f583c

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

+0 −38
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static android.os.BatteryManager.EXTRA_MAX_CHARGING_CURRENT; 
import static android.os.BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE;

import static android.os.BatteryManager.EXTRA_PLUGGED;

import static android.os.BatteryManager.EXTRA_STATUS;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT;



import android.app.ActivityManager;

import android.app.AlarmManager;
@@ -106,12 +105,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    private static final String ACTION_FACE_UNLOCK_STOPPED

            = "com.android.facelock.FACE_UNLOCK_STOPPED";



    private static final String ACTION_STRONG_AUTH_TIMEOUT =

            "com.android.systemui.ACTION_STRONG_AUTH_TIMEOUT";

    private static final String USER_ID = "com.android.systemui.USER_ID";



    private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF";



    // Callback messages

    private static final int MSG_TIME_UPDATE = 301;

    private static final int MSG_BATTERY_UPDATE = 302;
@@ -203,7 +196,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    private boolean mDeviceInteractive;

    private boolean mScreenOn;

    private SubscriptionManager mSubscriptionManager;

    private AlarmManager mAlarmManager;

    private List<SubscriptionInfo> mSubscriptionInfo;

    private TrustManager mTrustManager;

    private UserManager mUserManager;
@@ -588,26 +580,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    }



    public void reportSuccessfulStrongAuthUnlockAttempt() {

        scheduleStrongAuthTimeout();

        if (mFpm != null) {

            byte[] token = null; /* TODO: pass real auth token once fp HAL supports it */

            mFpm.resetTimeout(token);

        }

    }



    private void scheduleStrongAuthTimeout() {

        final DevicePolicyManager dpm =

                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);

        long when = SystemClock.elapsedRealtime() + dpm.getRequiredStrongAuthTimeout(null,

                sCurrentUser);

        Intent intent = new Intent(ACTION_STRONG_AUTH_TIMEOUT);

        intent.putExtra(USER_ID, sCurrentUser);

        PendingIntent sender = PendingIntent.getBroadcast(mContext,

                sCurrentUser, intent, PendingIntent.FLAG_CANCEL_CURRENT);

        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME, when, sender);

        notifyStrongAuthStateChanged(sCurrentUser);

    }



    private void notifyStrongAuthStateChanged(int userId) {

        for (int i = 0; i < mCallbacks.size(); i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
@@ -723,17 +701,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        }

    };



    private final BroadcastReceiver mStrongAuthTimeoutReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (ACTION_STRONG_AUTH_TIMEOUT.equals(intent.getAction())) {

                int userId = intent.getIntExtra(USER_ID, -1);

                mLockPatternUtils.requireStrongAuth(STRONG_AUTH_REQUIRED_AFTER_TIMEOUT, userId);

                notifyStrongAuthStateChanged(userId);

            }

        }

    };



    private final FingerprintManager.LockoutResetCallback mLockoutResetCallback

            = new FingerprintManager.LockoutResetCallback() {

        @Override
@@ -1034,7 +1001,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    private KeyguardUpdateMonitor(Context context) {

        mContext = context;

        mSubscriptionManager = SubscriptionManager.from(context);

        mAlarmManager = context.getSystemService(AlarmManager.class);

        mDeviceProvisioned = isDeviceProvisionedInSettingsDb();

        mStrongAuthTracker = new StrongAuthTracker(context);
@@ -1094,10 +1060,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
            e.rethrowAsRuntimeException();

        }



        IntentFilter strongAuthTimeoutFilter = new IntentFilter();

        strongAuthTimeoutFilter.addAction(ACTION_STRONG_AUTH_TIMEOUT);

        context.registerReceiver(mStrongAuthTimeoutReceiver, strongAuthTimeoutFilter,

                PERMISSION_SELF, null /* handler */);

        mTrustManager = (TrustManager) context.getSystemService(Context.TRUST_SERVICE);

        mTrustManager.registerTrustListener(this);

        mLockPatternUtils = new LockPatternUtils(context);

services/core/java/com/android/server/LockSettingsService.java

+5 −3
Original line number Diff line number Diff line
@@ -1196,10 +1196,12 @@ public class LockSettingsService extends ILockSettings.Stub { 
        VerifyCredentialResponse response = verifyCredential(userId, storedHash, credentialToVerify,

                hasChallenge, challenge, progressCallback);



        if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK

                && shouldReEnrollBaseZero) {

        if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {

            mStrongAuth.reportSuccessfulStrongAuthUnlock(userId);

            if (shouldReEnrollBaseZero) {

                setLockCredentialInternal(credential, storedHash.type, credentialToVerify, userId);

            }

        }



        return response;

    }

services/core/java/com/android/server/LockSettingsStrongAuth.java

+59 −2
Original line number Diff line number Diff line
@@ -16,23 +16,30 @@ 


package com.android.server;



import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_TIMEOUT;



import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils.StrongAuthTracker;



import android.app.AlarmManager;

import android.app.AlarmManager.OnAlarmListener;

import android.app.admin.DevicePolicyManager;

import android.app.trust.IStrongAuthTracker;

import android.content.Context;

import android.os.Binder;

import android.os.DeadObjectException;

import android.os.Handler;

import android.os.Message;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.Slog;

import android.util.SparseIntArray;



import java.util.ArrayList;



import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED;



/**

 * Keeps track of requests for strong authentication.

 */
@@ -45,12 +52,22 @@ public class LockSettingsStrongAuth { 
    private static final int MSG_UNREGISTER_TRACKER = 3;

    private static final int MSG_REMOVE_USER = 4;



    private static final String STRONG_AUTH_TIMEOUT_ALARM_TAG =

            "LockSettingsStrongAuth.timeoutForUser";



    private final ArrayList<IStrongAuthTracker> mStrongAuthTrackers = new ArrayList<>();

    private final SparseIntArray mStrongAuthForUser = new SparseIntArray();

    private final ArrayMap<Integer, StrongAuthTimeoutAlarmListener>

            mStrongAuthTimeoutAlarmListenerForUser = new ArrayMap<>();

    private final int mDefaultStrongAuthFlags;

    private final Context mContext;



    private AlarmManager mAlarmManager;



    public LockSettingsStrongAuth(Context context) {

        mContext = context;

        mDefaultStrongAuthFlags = StrongAuthTracker.getDefaultFlags(context);

        mAlarmManager = context.getSystemService(AlarmManager.class);

    }



    private void handleAddStrongAuthTracker(IStrongAuthTracker tracker) {
@@ -151,6 +168,46 @@ public class LockSettingsStrongAuth { 
        requireStrongAuth(STRONG_AUTH_NOT_REQUIRED, userId);

    }



    public void reportSuccessfulStrongAuthUnlock(int userId) {

        scheduleStrongAuthTimeout(userId);

    }



    private void scheduleStrongAuthTimeout(int userId) {

        final DevicePolicyManager dpm =

                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);

        long when = SystemClock.elapsedRealtime() + dpm.getRequiredStrongAuthTimeout(null, userId);

        // cancel current alarm listener for the user (if there was one)

        StrongAuthTimeoutAlarmListener alarm = mStrongAuthTimeoutAlarmListenerForUser.get(userId);

        if (alarm != null) {

            mAlarmManager.cancel(alarm);

        } else {

            alarm = new StrongAuthTimeoutAlarmListener(userId);

            mStrongAuthTimeoutAlarmListenerForUser.put(userId, alarm);

        }

        // schedule a new alarm listener for the user

        final long ident = Binder.clearCallingIdentity();

        try {

            mAlarmManager.set(AlarmManager.ELAPSED_REALTIME, when, STRONG_AUTH_TIMEOUT_ALARM_TAG,

                    alarm, mHandler);

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }



    private class StrongAuthTimeoutAlarmListener implements OnAlarmListener {



        private final int mUserId;



        public StrongAuthTimeoutAlarmListener(int userId) {

            mUserId = userId;

        }



        @Override

        public void onAlarm() {

            requireStrongAuth(STRONG_AUTH_REQUIRED_AFTER_TIMEOUT, mUserId);

        }

    }



    private final Handler mHandler = new Handler() {

        @Override

        public void handleMessage(Message msg) {