Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 41fb54b955

Change-Id: I15056a18d70a1d17c52799f71e8faf5c565bb8aa
This commit is contained in:
luozhanwei
2017-12-11 16:14:17 +00:00
committed by android-build-merger
parent 51e563aefb 41fb54b955
commit 81544d2a71
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/PackageManagerService.java
View File

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