Commit 4cf6e804 authored Mar 22, 2016 by guoyin.chen Committed by android-build-merger Mar 22, 2016

Merge "com.android.cts.appsecurity.AdoptableHostTest may trigger below dead...

Merge "com.android.cts.appsecurity.AdoptableHostTest may trigger below dead lock in system_server in the board with external adoptable storage as below stack:" into nyc-dev
am: 362636da

* commit '362636da':
  com.android.cts.appsecurity.AdoptableHostTest may trigger below dead lock in system_server in the board with external adoptable storage as below stack:

parents 329cf2ab 362636da

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -10457,10 +10457,10 @@ public class PackageManagerService extends IPackageManager.Stub {

		void startCleaningPackages() {
		// reader
		synchronized (mPackages) {
		if (!isExternalMediaAvailable()) {
		return;
		}
		synchronized (mPackages) {
		if (mSettings.mPackagesToBeCleaned.isEmpty()) {
		return;
		}