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

Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-dev

Browse Source
This commit is contained in:
Zimuzo Ezeozue
2021-07-14 17:36:07 +00:00
committed by Android (Google) Code Review
parent b42f19e297 9bce52c0b9
commit 964a1e0f72
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;
}