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

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

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

Merge "Fix a race condition in acquiring content provider" into sc-dev am: a57d682a am: 9c5409b7 am: d62cb184

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

Change-Id: I486e4987c6219e787f32955783bc3945738514b8
parents 13b7d87e d62cb184

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...