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

Commit d0f66469 authored by Haining Chen's avatar Haining Chen
Browse files

Allow LockSettings logs to be enabled by adb 

To enable the logs, do the following after each reboot:
adb shell setprop log.tag.[TAG_NAME] DEBUG && adb root && adb shell am
restart lock_settings, where TAG_NAME is LockSettingsService or
LockSettingsStrongAuth

Bug: 268526331
Test: Manually enable logs via adb cmds and check logs

Change-Id: I0c081aa008bbcfe6392576822ddf80fbf18ebd4b
parent bb994c9b

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)