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

Merge "[BugFix] acquireProvider maybe wait for timeout" am: bf7ab279a6 am: 2ee9e5dbb7 am: 25fb447edc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1999690

Change-Id: I48bc9e68457689f60d7825e015df47805398bb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Ji
2022-04-20 06:06:57 +00:00
committed by Automerger Merge Worker
parent 5fe325e16a 25fb447edc
commit d448360623
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityThread.java
View File

@@ -7030,7 +7030,13 @@ public final class ActivityThread extends ClientTransactionHandler
// local, we'll need to wait for the publishing of the provider. // local, we'll need to wait for the publishing of the provider.
if (holder != null && holder.provider == null && !holder.mLocal) { if (holder != null && holder.provider == null && !holder.mLocal) {
synchronized (key.mLock) { synchronized (key.mLock) {
key.mLock.wait(ContentResolver.CONTENT_PROVIDER_READY_TIMEOUT_MILLIS); if (key.mHolder != null) {
if (DEBUG_PROVIDER) {
Slog.i(TAG, "already received provider: " + auth);
}
} else {
key.mLock.wait(ContentResolver.CONTENT_PROVIDER_READY_TIMEOUT_MILLIS);
}
holder = key.mHolder; holder = key.mHolder;
} }
if (holder != null && holder.provider == null) { if (holder != null && holder.provider == null) {