Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25fb447e authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "[BugFix] acquireProvider maybe wait for timeout" am: bf7ab279 am: 2ee9e5db 

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



Change-Id: Iccee206444942214c474b5ecd649db0783ab5b27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2fe15e9 2ee9e5db

core/java/android/app/ActivityThread.java

+7 −1
Original line number Diff line number Diff line
@@ -7026,7 +7026,13 @@ public final class ActivityThread extends ClientTransactionHandler 
                // local, we'll need to wait for the publishing of the provider.

                if (holder != null && holder.provider == null && !holder.mLocal) {

                    synchronized (key.mLock) {

                        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;

                    }

                    if (holder != null && holder.provider == null) {