Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restore permission check in keyguard." into klp-dev

Browse Source
This commit is contained in:
Jim Miller
2013-11-09 00:22:07 +00:00
committed by Android (Google) Code Review
parent 105b9b0504 505329b21b
commit ed7376fc48
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Keyguard/AndroidManifest.xml
View File

@@ -38,6 +38,7 @@
<uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" /> <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.CHANGE_COMPONENT_ENABLED_STATE" />
<uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" /> <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" <application android:label="@string/app_name"
android:process="com.android.systemui" android:process="com.android.systemui"

4
services/java/com/android/server/LockSettingsService.java
View File

@@ -154,11 +154,11 @@ public class LockSettingsService extends ILockSettings.Stub {
} }
private final void checkWritePermission(int userId) { private final void checkWritePermission(int userId) {
mContext.checkCallingOrSelfPermission(PERMISSION); mContext.enforceCallingOrSelfPermission(PERMISSION, "LockSettingsWrite");
} }
private final void checkPasswordReadPermission(int userId) { private final void checkPasswordReadPermission(int userId) {
mContext.checkCallingOrSelfPermission(PERMISSION); mContext.enforceCallingOrSelfPermission(PERMISSION, "LockSettingsRead");
} }
private final void checkReadPermission(String requestedKey, int userId) { private final void checkReadPermission(String requestedKey, int userId) {