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

Commit 783078ae authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes from topic "locksettings-aosp" into main am: 7df13d67 am:... 

Merge changes from topic "locksettings-aosp" into main am: 7df13d67 am: 7fcb018b am: 40832590 am: efc42901

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



Change-Id: Ie44e85c188f23d0661ca9efebc7799cbbb688841
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4098a22 efc42901

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

+0 −7
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ import android.system.keystore2.Domain; 
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;
@@ -863,9 +862,6 @@ public class LockSettingsService extends ILockSettings.Stub { 


    @Override // binder interface

    public void systemReady() {

        if (mContext.checkCallingOrSelfPermission(PERMISSION) != PERMISSION_GRANTED) {

            EventLog.writeEvent(0x534e4554, "28251513", getCallingUid(), "");  // SafetyNet

        }

        checkWritePermission();



        mHasSecureLockScreen = mContext.getPackageManager()
@@ -1120,9 +1116,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
    }



    private final void checkPasswordHavePermission() {

        if (mContext.checkCallingOrSelfPermission(PERMISSION) != PERMISSION_GRANTED) {

            EventLog.writeEvent(0x534e4554, "28251513", getCallingUid(), "");  // SafetyNet

        }

        mContext.enforceCallingOrSelfPermission(PERMISSION, "LockSettingsHave");

    }