Merge "Don't hold the CPH lock while installing providers." into sc-dev (4e974ce2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ContentProviderHelper.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1206,10 +1206,10 @@ public class ContentProviderHelper {
	}		}
	}		}

	synchronized (this) {
	if (providers != null) {		if (providers != null) {
	mService.mSystemThread.installSystemProviders(providers);		mService.mSystemThread.installSystemProviders(providers);
	}		}
			synchronized (this) {
	mSystemProvidersInstalled = true;		mSystemProvidersInstalled = true;
	}		}