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

Merge "Fix a race condition in acquiring content provider" into sc-dev

Browse Source
This commit is contained in:
Jing Ji
2021-06-04 22:06:42 +00:00
committed by Android (Google) Code Review
parent 0b4b1ccbdb 42e44711fa
commit a57d682aaf
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ContentProviderHelper.java
View File

@@ -501,7 +501,6 @@ public class ContentProviderHelper {
mService.grantImplicitAccess(userId, null, callingUid, mService.grantImplicitAccess(userId, null, callingUid,
UserHandle.getAppId(cpi.applicationInfo.uid)); UserHandle.getAppId(cpi.applicationInfo.uid));
}
if (caller != null) { if (caller != null) {
// The client will be waiting, and we'll notify it when the provider is ready. // 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); ContentResolver.CONTENT_PROVIDER_READY_TIMEOUT_MILLIS);
} }
} }
// Return a holder instance even if we are waiting for the publishing of the provider, // Return a holder instance even if we are waiting for the publishing of the
// client will check for the holder.provider to see if it needs to wait for it. // provider, client will check for the holder.provider to see if it needs to wait
// for it.
return cpr.newHolder(conn, false); return cpr.newHolder(conn, false);
} }
}
// Because of the provider's external client (i.e., SHELL), we'll have to wait right here. // Because of the provider's external client (i.e., SHELL), we'll have to wait right here.
// Wait for the provider to be published... // Wait for the provider to be published...