Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev

2015-07-23 17:22:29 +00:00
parent 304b01c249 2bd5cff7c6
commit b3e407609f
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -3431,6 +3431,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);