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

Commit 4a3605a7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [6926931, 6926087, 6926088] into qt-release 

Change-Id: Ibd771abe7adc53cca3cceb2a365c6233050071f1
parents 4ee4f090 7d8b1c0d

services/core/java/com/android/server/StorageManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -3840,7 +3840,9 @@ class StorageManagerService extends IStorageManager.Stub 
                    uid, packageName, READ_EXTERNAL_STORAGE, OP_READ_EXTERNAL_STORAGE);

            final boolean hasWrite = StorageManager.checkPermissionAndAppOp(mContext, false, 0,

                    uid, packageName, WRITE_EXTERNAL_STORAGE, OP_WRITE_EXTERNAL_STORAGE);

            final boolean hasStorage = hasRead || hasWrite;

            // STOPSHIP: remove this temporary hack once we have dynamic runtime

            // permissions fully enabled again

            final boolean hasStorage = hasRead || hasWrite || true;



            // We're only willing to give out broad access if they also hold

            // runtime permission; this is a firm CDD requirement