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

Fix wrong LEGACY_STORAGE appop grant

Browse Source 
Apps with WRITE_MEDIA_STORAGE permission should only be granted the
LEGACY_STORAGE appop while they target <R. This was the original
intention, but Ic24372348118ad9ed818a28f377e0decc78b9ecc changed
the behavior to allow the legacy appop for apps with
WRITE_MEDIA_STORAGE permission regardless of target SDK.

This change prevents granting the legacy storage appop to
apps with WRITE_MEDIA_STORAGE permission if they target
>=R. Additionally, we also deny the appop if they target >=R.

Bug: 190001005
Test: atest RestrictedStoragePermissionTest
Test: atest PreserveLegacyStorageHostTest
Test: Manually installed a targetR app with WRITE_MEDIA_STORAGE
permission and verified that legacy_storage was ignored
Change-Id: Icd804e289491a2416bcb9b5f78012314027af047
This commit is contained in:
Zim
2021-07-12 15:31:22 +01:00
committed by Zimuzo Ezeozue
parent aae8854106
commit 9bce52c0b9
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
View File

@@ -189,12 +189,16 @@ public abstract class SoftRestrictedPermissionPolicy {
return false;
}
// 3. The app has WRITE_MEDIA_STORAGE, OR
// the app already has legacy external storage or requested it,
// and is < R.
return hasWriteMediaStorageGrantedForUid
|| ((hasLegacyExternalStorage || hasRequestedLegacyExternalStorage)
&& targetSDK < Build.VERSION_CODES.R);
// 3. The app targetSDK should be less than R
if (targetSDK >= Build.VERSION_CODES.R) {
return false;
}
// 4. The app has WRITE_MEDIA_STORAGE,
// OR the app already has legacy external storage
// OR the app requested legacy external storage
return hasWriteMediaStorageGrantedForUid || hasLegacyExternalStorage
|| hasRequestedLegacyExternalStorage;
}
@Override
public boolean mayDenyExtraAppOpIfGranted() {
@@ -216,10 +220,8 @@ public abstract class SoftRestrictedPermissionPolicy {
return true;
}
// The package doesn't have WRITE_MEDIA_STORAGE,
// AND didn't request legacy storage to be preserved
if (!hasWriteMediaStorageGrantedForUid
&& !hasRequestedPreserveLegacyExternalStorage) {
// The package doesn't request legacy storage to be preserved
if (!hasRequestedPreserveLegacyExternalStorage) {
return true;
}