Merge "Fix a race condition in acquiring content provider" into sc-dev (a57d682a) · Commits · e / os / android_frameworks_base

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

+27 −26

Original line number	Diff line number	Diff line
		@@ -501,7 +501,6 @@ public class ContentProviderHelper {

		mService.grantImplicitAccess(userId, null, callingUid,
		UserHandle.getAppId(cpi.applicationInfo.uid));
		}

		if (caller != null) {
		// The client will be waiting, and we'll notify it when the provider is ready.
		@@ -529,10 +528,12 @@ public class ContentProviderHelper {
		ContentResolver.CONTENT_PROVIDER_READY_TIMEOUT_MILLIS);
		}
		}
		// Return a holder instance even if we are waiting for the publishing of the provider,
		// client will check for the holder.provider to see if it needs to wait for it.
		// Return a holder instance even if we are waiting for the publishing of the
		// provider, client will check for the holder.provider to see if it needs to wait
		// for it.
		return cpr.newHolder(conn, false);
		}
		}

		// Because of the provider's external client (i.e., SHELL), we'll have to wait right here.
		// Wait for the provider to be published...