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

Commit 40832590 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: 7fcb018b 

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



Change-Id: I039d0b0f563272e2a5da53fa15f269d45c752425
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1defa04 7fcb018b

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

+0 −7
Original line number Diff line number Diff line
@@ -115,7 +115,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;
@@ -861,9 +860,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()
@@ -1108,9 +1104,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");

    }