diff options
| author | 2023-10-09 20:52:00 +0000 | |
|---|---|---|
| committer | 2023-10-09 20:52:00 +0000 | |
| commit | 7fcb018b7a9239fb44d17bcc228b091f23888653 (patch) | |
| tree | a46678ed5c39630b87794dbf88d4cf3337c57458 | |
| parent | 9e9f7294aef7c785b2c3789b100db9efd36cadac (diff) | |
| parent | 7df13d67febe66e23343102f58fd2118131a4c41 (diff) | |
Merge changes from topic "locksettings-aosp" into main am: 7df13d67fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775386
Change-Id: I322402280a0156dc0e0fad236a37a0c34144a226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/locksettings/LockSettingsService.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index f08bdb81945e..ff959decac33 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -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"); } |