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

Commit ce73d742 authored by Haining Chen's avatar Haining Chen Committed by Automerger Merge Worker
Browse files

Merge "Allow LockSettings logs to be enabled by adb" into tm-qpr-dev am: 8729fae6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21345698



Change-Id: I6acae06971e42be070f827aa5bbc8b987de59e1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35c676ff 8729fae6

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

+3 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import android.hardware.fingerprint.Fingerprint; 
import android.hardware.fingerprint.FingerprintManager;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;
@@ -117,6 +118,7 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.EventLog;

import android.util.Log;

import android.util.LongSparseArray;

import android.util.Slog;

import android.util.SparseArray;
@@ -203,7 +205,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
    private static final String TAG = "LockSettingsService";

    private static final String PERMISSION = ACCESS_KEYGUARD_SECURE_STORAGE;

    private static final String BIOMETRIC_PERMISSION = MANAGE_BIOMETRIC;

    private static final boolean DEBUG = false;

    private static final boolean DEBUG = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.DEBUG);



    private static final int PROFILE_KEY_IV_SIZE = 12;

    private static final String SEPARATE_PROFILE_CHALLENGE_KEY = "lockscreen.profilechallenge";

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

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.AlarmManager.OnAlarmListener; 
import android.app.admin.DevicePolicyManager;

import android.app.trust.IStrongAuthTracker;

import android.content.Context;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -33,6 +34,7 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Slog;

import android.util.SparseBooleanArray;

import android.util.SparseIntArray;
@@ -46,8 +48,8 @@ import com.android.internal.widget.LockPatternUtils.StrongAuthTracker; 
 */

public class LockSettingsStrongAuth {



    private static final String TAG = "LockSettings";

    private static final boolean DEBUG = false;

    private static final String TAG = "LockSettingsStrongAuth";

    private static final boolean DEBUG = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.DEBUG);



    private static final int MSG_REQUIRE_STRONG_AUTH = 1;

    private static final int MSG_REGISTER_TRACKER = 2;
@@ -267,6 +269,7 @@ public class LockSettingsStrongAuth { 
    }



    private void handleScheduleStrongAuthTimeout(int userId) {

        if (DEBUG) Slog.d(TAG, "handleScheduleStrongAuthTimeout for userId=" + userId);

        rescheduleStrongAuthTimeoutAlarm(mInjector.getElapsedRealtimeMs(), userId);



        // cancel current non-strong biometric alarm listener for the user (if there was one)