summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/LockSettingsService.java
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2015-06-23 06:16:25 +0000
committerBart Sears <bsears@google.com>2015-06-23 06:16:25 +0000
commited5ff51b2ca7c051e2719dfc8a8a083e6208848e (patch)
treedbc4f089cb1b45a7405da654926049b525f57656 /services/core/java/com/android/server/LockSettingsService.java
parenta2991da0d671adf511ccb884cf25bf1241303f92 (diff)
downloadframeworks_base-ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.zip
frameworks_base-ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.tar.gz
frameworks_base-ed5ff51b2ca7c051e2719dfc8a8a083e6208848e.tar.bz2
Revert "Remove not needed contacts related perissions."
Broke the build, reverting. This reverts commit a2991da0d671adf511ccb884cf25bf1241303f92. Change-Id: I2bdfa70fbd8a6c03e48426f85eeb63896762d5da
Diffstat (limited to 'services/core/java/com/android/server/LockSettingsService.java')
-rw-r--r--services/core/java/com/android/server/LockSettingsService.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index c5ea8bc..5436ce0 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -27,10 +27,11 @@ import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import static android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE;
import static android.content.Context.USER_SERVICE;
-import static android.Manifest.permission.READ_CONTACTS;
+import static android.Manifest.permission.READ_PROFILE;
import android.database.sqlite.SQLiteDatabase;
import android.os.Binder;
import android.os.IBinder;
+import android.os.Process;
import android.os.RemoteException;
import android.os.storage.IMountService;
import android.os.ServiceManager;
@@ -263,12 +264,12 @@ public class LockSettingsService extends ILockSettings.Stub {
private final void checkReadPermission(String requestedKey, int userId) {
final int callingUid = Binder.getCallingUid();
- for (int i = 0; i < READ_CONTACTS_PROTECTED_SETTINGS.length; i++) {
- String key = READ_CONTACTS_PROTECTED_SETTINGS[i];
- if (key.equals(requestedKey) && mContext.checkCallingOrSelfPermission(READ_CONTACTS)
+ for (int i = 0; i < READ_PROFILE_PROTECTED_SETTINGS.length; i++) {
+ String key = READ_PROFILE_PROTECTED_SETTINGS[i];
+ if (key.equals(requestedKey) && mContext.checkCallingOrSelfPermission(READ_PROFILE)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("uid=" + callingUid
- + " needs permission " + READ_CONTACTS + " to read "
+ + " needs permission " + READ_PROFILE + " to read "
+ requestedKey + " for user " + userId);
}
}
@@ -721,8 +722,8 @@ public class LockSettingsService extends ILockSettings.Stub {
Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED
};
- // Reading these settings needs the contacts permission
- private static final String[] READ_CONTACTS_PROTECTED_SETTINGS = new String[] {
+ // Reading these settings needs the profile permission
+ private static final String[] READ_PROFILE_PROTECTED_SETTINGS = new String[] {
Secure.LOCK_SCREEN_OWNER_INFO_ENABLED,
Secure.LOCK_SCREEN_OWNER_INFO
};