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

Commit 81b5d555 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 448af885: am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and... 

am 448af885: am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev

* commit '448af885':
  Avoid a deadlock between PMS and AppOpsService
parents 6d8cf7a7 448af885

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

+5 −0
Original line number Diff line number Diff line
@@ -3488,6 +3488,11 @@ class MountService extends IMountService.Stub 
        }



        public boolean hasExternalStorage(int uid, String packageName) {

            // No need to check for system uid. This avoids a deadlock between

            // PackageManagerService and AppOpsService.

            if (uid == Process.SYSTEM_UID) {

                return true;

            }

            // No locking - CopyOnWriteArrayList

            for (ExternalStorageMountPolicy policy : mPolicies) {

                final boolean policyHasStorage = policy.hasExternalStorage(uid, packageName);