Merge "[DeadLock]AMS PMS MountService" am: 998ac99db4 am: 41fb54b955

am: 81544d2a71

Change-Id: Ib92a19bce9fd9086c302c2cf4606b5d10161fe85

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -12884,14 +12884,13 @@ public class PackageManagerService extends IPackageManager.Stub
         if (getInstantAppPackageName(Binder.getCallingUid()) != null) {
             return null;
         }
-        // writer
-        synchronized (mPackages) {
-            if (!isExternalMediaAvailable()) {
+        if (!isExternalMediaAvailable()) {
                 // If the external storage is no longer mounted at this point,
                 // the caller may not have been able to delete all of this
                 // packages files and can not delete any more.  Bail.
-                return null;
-            }
+            return null;
+        }
+        synchronized (mPackages) {
             final ArrayList<PackageCleanItem> pkgs = mSettings.mPackagesToBeCleaned;
             if (lastPackage != null) {
                 pkgs.remove(lastPackage);