Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17999f4e authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-dev am: 964a1e0f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15272231

Change-Id: I5ec40176569edf6121485e7a44c66d72b36b1a6a
parents 2d628c1c 964a1e0f

services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java

+12 −10
Original line number Diff line number Diff line
@@ -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;

                        }