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

Commit a6754bb8 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 7aa535a8: am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev 

* commit '7aa535a8':
  Restore permission check in keyguard.
parents 4cccc47c 7aa535a8

packages/Keyguard/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
    <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" />

    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />

    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />

    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />



    <application android:label="@string/app_name"

        android:process="com.android.systemui"

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

+2 −2
Original line number Diff line number Diff line
@@ -154,11 +154,11 @@ public class LockSettingsService extends ILockSettings.Stub { 
    }



    private final void checkWritePermission(int userId) {

        mContext.checkCallingOrSelfPermission(PERMISSION);

        mContext.enforceCallingOrSelfPermission(PERMISSION, "LockSettingsWrite");

    }



    private final void checkPasswordReadPermission(int userId) {

        mContext.checkCallingOrSelfPermission(PERMISSION);

        mContext.enforceCallingOrSelfPermission(PERMISSION, "LockSettingsRead");

    }



    private final void checkReadPermission(String requestedKey, int userId) {