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

Merge "Mark all published authorities for a provider as ready" into sc-dev

Browse Source
This commit is contained in:
Amith Yamasani
2021-06-21 16:31:09 +00:00
committed by Android (Google) Code Review
parent 648711dad7 e7f966d559
commit d39b5f032c
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -447,7 +447,7 @@ public final class ActivityThread extends ClientTransactionHandler
@GuardedBy("mLock") @GuardedBy("mLock")
ContentProviderHolder mHolder; // Temp holder to be used between notifier and waiter ContentProviderHolder mHolder; // Temp holder to be used between notifier and waiter
Object mLock; // The lock to be used to get notified when the provider is ready final Object mLock; // The lock to be used to get notified when the provider is ready
public ProviderKey(String authority, int userId) { public ProviderKey(String authority, int userId) {
this.authority = authority; this.authority = authority;
@@ -1827,11 +1827,14 @@ public final class ActivityThread extends ClientTransactionHandler
@Override @Override
public void notifyContentProviderPublishStatus(@NonNull ContentProviderHolder holder, public void notifyContentProviderPublishStatus(@NonNull ContentProviderHolder holder,
@NonNull String auth, int userId, boolean published) { @NonNull String authorities, int userId, boolean published) {
final ProviderKey key = getGetProviderKey(auth, userId); final String auths[] = authorities.split(";");
synchronized (key.mLock) { for (String auth: auths) {
key.mHolder = holder; final ProviderKey key = getGetProviderKey(auth, userId);
key.mLock.notifyAll(); synchronized (key.mLock) {
key.mHolder = holder;
key.mLock.notifyAll();
}
} }
} }

2
core/java/android/app/IApplicationThread.aidl
View File

@@ -153,7 +153,7 @@ oneway interface IApplicationThread {
void performDirectAction(IBinder activityToken, String actionId, void performDirectAction(IBinder activityToken, String actionId,
in Bundle arguments, in RemoteCallback cancellationCallback, in Bundle arguments, in RemoteCallback cancellationCallback,
in RemoteCallback resultCallback); in RemoteCallback resultCallback);
void notifyContentProviderPublishStatus(in ContentProviderHolder holder, String auth, void notifyContentProviderPublishStatus(in ContentProviderHolder holder, String authorities,
int userId, boolean published); int userId, boolean published);
void instrumentWithoutRestart(in ComponentName instrumentationName, void instrumentWithoutRestart(in ComponentName instrumentationName,
in Bundle instrumentationArgs, in Bundle instrumentationArgs,