diff options
| author | 2017-03-15 11:08:04 -0700 | |
|---|---|---|
| committer | 2017-03-15 11:08:04 -0700 | |
| commit | 76a40575e8776c91c69bd1271b70e9a183b838d5 (patch) | |
| tree | 84c94ae3a435bfa54b9bbc33bf8070053b890698 | |
| parent | 402a384ac83338b5ec4c04dde3c9ba969de51c0f (diff) | |
Change vold cryptkeeper permissions to be more sensible
Bug: 35851488
Test: Check boots with default encryption and password encryption
Change-Id: I4afd07619369ef2b3ec86056e5c154823c73b5fd
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 3667ecdec472..8e6310fdacbb 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -2721,7 +2721,7 @@ class StorageManagerService extends IStorageManager.Stub */ @Override public int getPasswordType() { - mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL, + mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); waitForReady(); @@ -2747,7 +2747,7 @@ class StorageManagerService extends IStorageManager.Stub */ @Override public void setField(String field, String contents) throws RemoteException { - mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL, + mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); waitForReady(); @@ -2767,7 +2767,7 @@ class StorageManagerService extends IStorageManager.Stub */ @Override public String getField(String field) throws RemoteException { - mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL, + mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); waitForReady(); @@ -2793,7 +2793,7 @@ class StorageManagerService extends IStorageManager.Stub */ @Override public boolean isConvertibleToFBE() throws RemoteException { - mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL, + mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); waitForReady(); @@ -2809,7 +2809,7 @@ class StorageManagerService extends IStorageManager.Stub @Override public String getPassword() throws RemoteException { - mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL, + mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "only keyguard can retrieve password"); if (!isReady()) { @@ -2834,7 +2834,7 @@ class StorageManagerService extends IStorageManager.Stub @Override public void clearPassword() throws RemoteException { - mContext.enforceCallingOrSelfPermission(Manifest.permission.STORAGE_INTERNAL, + mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "only keyguard can clear password"); if (!isReady()) { |