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

Merge "Move the waiting for the publishing of content provider to client side"

Browse Source
This commit is contained in:
Jing Ji
2020-08-05 23:53:14 +00:00
committed by Android (Google) Code Review
parent fb88679934 4dc70f1c08
commit 9bd766deaf
7 changed files with 169 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,6 +420,8 @@ public final class ActivityThread extends ClientTransactionHandler {
private static final class ProviderKey {
final String authority;
final int userId;
ContentProviderHolder mHolder; // Temp holder to be used between notifier and waiter
int mWaiters; // Number of threads waiting on the publishing of the provider
public ProviderKey(String authority, int userId) {
this.authority = authority;
@@ -437,7 +439,11 @@ public final class ActivityThread extends ClientTransactionHandler {
@Override
public int hashCode() {
return ((authority != null) ? authority.hashCode() : 0) ^ userId;
return hashCode(authority, userId);
}
public static int hashCode(final String auth, final int userIdent) {
return ((auth != null) ? auth.hashCode() : 0) ^ userIdent;
}
}
@@ -458,9 +464,8 @@ public final class ActivityThread extends ClientTransactionHandler {
// Mitigation for b/74523247: Used to serialize calls to AM.getContentProvider().
// Note we never removes items from this map but that's okay because there are only so many
// users and so many authorities.
// TODO Remove it once we move CPR.wait() from AMS to the client side.
@GuardedBy("mGetProviderLocks")
final ArrayMap<ProviderKey, Object> mGetProviderLocks = new ArrayMap<>();
@GuardedBy("mGetProviderKeys")
final SparseArray<ProviderKey> mGetProviderKeys = new SparseArray<>();
final ArrayMap<Activity, ArrayList<OnActivityPausedListener>> mOnPauseListeners
= new ArrayMap<Activity, ArrayList<OnActivityPausedListener>>();
@@ -1751,6 +1756,16 @@ public final class ActivityThread extends ClientTransactionHandler {
ActivityThread.this, activityToken, actionId, arguments,
cancellationSignal, resultCallback));
}
@Override
public void notifyContentProviderPublishStatus(@NonNull ContentProviderHolder holder,
@NonNull String auth, int userId, boolean published) {
final ProviderKey key = getGetProviderKey(auth, userId);
synchronized (key) {
key.mHolder = holder;
key.notifyAll();
}
}
}
private @NonNull SafeCancellationTransport createSafeCancellationTransport(
@@ -6796,13 +6811,40 @@ public final class ActivityThread extends ClientTransactionHandler {
// provider since it might take a long time to run and it could also potentially
// be re-entrant in the case where the provider is in the same process.
ContentProviderHolder holder = null;
try {
synchronized (getGetProviderLock(auth, userId)) {
holder = ActivityManager.getService().getContentProvider(
getApplicationThread(), c.getOpPackageName(), auth, userId, stable);
final ProviderKey key = getGetProviderKey(auth, userId);
synchronized (key) {
boolean wasWaiting = false;
try {
if (key.mWaiters == 0) {
// No other thread is waiting for this provider, let's fetch one by ourselves.
// If the returned holder is non-null but its provider is null and it's not
// local, we'll need to wait for the publishing of the provider.
holder = ActivityManager.getService().getContentProvider(
getApplicationThread(), c.getOpPackageName(), auth, userId, stable);
}
if ((holder != null && holder.provider == null && !holder.mLocal)
|| (key.mWaiters > 0 && (holder = key.mHolder) == null)) {
try {
key.mWaiters++;
wasWaiting = true;
key.wait(ContentResolver.CONTENT_PROVIDER_READY_TIMEOUT_MILLIS);
holder = key.mHolder;
if (holder != null && holder.provider == null) {
// probably timed out
holder = null;
}
} catch (InterruptedException e) {
holder = null;
}
}
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
} finally {
if (wasWaiting && --key.mWaiters == 0) {
// Clear the holder from the key since the key itself is never cleared.
key.mHolder = null;
}
}
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
if (holder == null) {
if (UserManager.get(c).isUserUnlocked(userId)) {
@@ -6820,13 +6862,13 @@ public final class ActivityThread extends ClientTransactionHandler {
return holder.provider;
}
private Object getGetProviderLock(String auth, int userId) {
final ProviderKey key = new ProviderKey(auth, userId);
synchronized (mGetProviderLocks) {
Object lock = mGetProviderLocks.get(key);
private ProviderKey getGetProviderKey(String auth, int userId) {
final int key = ProviderKey.hashCode(auth, userId);
synchronized (mGetProviderKeys) {
ProviderKey lock = mGetProviderKeys.get(key);
if (lock == null) {
lock = key;
mGetProviderLocks.put(key, lock);
lock = new ProviderKey(auth, userId);
mGetProviderKeys.put(key, lock);
}
return lock;
}

9
core/java/android/app/ContentProviderHolder.java
View File

@@ -39,6 +39,11 @@ public class ContentProviderHolder implements Parcelable {
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public boolean noReleaseNeeded;
/**
* Whether the provider here is a local provider or not.
*/
public boolean mLocal;
@UnsupportedAppUsage
public ContentProviderHolder(ProviderInfo _info) {
info = _info;
@@ -59,6 +64,7 @@ public class ContentProviderHolder implements Parcelable {
}
dest.writeStrongBinder(connection);
dest.writeInt(noReleaseNeeded ? 1 : 0);
dest.writeInt(mLocal ? 1 : 0);
}
public static final @android.annotation.NonNull Parcelable.Creator<ContentProviderHolder> CREATOR
@@ -81,5 +87,6 @@ public class ContentProviderHolder implements Parcelable {
source.readStrongBinder());
connection = source.readStrongBinder();
noReleaseNeeded = source.readInt() != 0;
mLocal = source.readInt() != 0;
}
}
}

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

@@ -16,6 +16,7 @@
package android.app;
import android.app.ContentProviderHolder;
import android.app.IInstrumentationWatcher;
import android.app.IUiAutomationConnection;
import android.app.ProfilerInfo;
@@ -147,4 +148,6 @@ oneway interface IApplicationThread {
void performDirectAction(IBinder activityToken, String actionId,
in Bundle arguments, in RemoteCallback cancellationCallback,
in RemoteCallback resultCallback);
void notifyContentProviderPublishStatus(in ContentProviderHolder holder, String auth,
int userId, boolean published);
}

6
core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java
View File

@@ -24,6 +24,7 @@ import static android.app.servertransaction.TestUtils.resultInfoList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import android.app.ContentProviderHolder;
import android.app.IApplicationThread;
import android.app.IInstrumentationWatcher;
import android.app.IUiAutomationConnection;
@@ -664,5 +665,10 @@ public class TransactionParcelTests {
public void performDirectAction(IBinder activityToken, String actionId, Bundle arguments,
RemoteCallback cancellationCallback, RemoteCallback resultCallback) {
}
@Override
public void notifyContentProviderPublishStatus(ContentProviderHolder holder, String auth,
int userId, boolean published) {
}
}
}

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -1579,6 +1579,7 @@ public class ActivityManagerService extends IActivityManager.Stub
static final int DISPATCH_OOM_ADJ_OBSERVER_MSG = 70;
static final int KILL_APP_ZYGOTE_MSG = 71;
static final int BINDER_HEAVYHITTER_AUTOSAMPLER_TIMEOUT_MSG = 72;
static final int WAIT_FOR_CONTENT_PROVIDER_TIMEOUT_MSG = 73;
static final int FIRST_BROADCAST_QUEUE_MSG = 200;
@@ -1915,6 +1916,11 @@ public class ActivityManagerService extends IActivityManager.Stub
case BINDER_HEAVYHITTER_AUTOSAMPLER_TIMEOUT_MSG: {
handleBinderHeavyHitterAutoSamplerTimeOut();
} break;
case WAIT_FOR_CONTENT_PROVIDER_TIMEOUT_MSG: {
synchronized (ActivityManagerService.this) {
((ContentProviderRecord) msg.obj).onProviderPublishStatusLocked(false);
}
} break;
}
}
}

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

@@ -50,6 +50,7 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Debug;
import android.os.IBinder;
import android.os.Message;
import android.os.Process;
import android.os.RemoteCallback;
import android.os.RemoteException;
@@ -218,7 +219,7 @@ public class ContentProviderHelper {
// of being published... but it is also allowed to run
// in the caller's process, so don't make a connection
// and just let the caller instantiate its own instance.
ContentProviderHolder holder = cpr.newHolder(null);
ContentProviderHolder holder = cpr.newHolder(null, true);
// don't give caller the provider object, it needs to make its own.
holder.provider = null;
return holder;
@@ -415,7 +416,7 @@ public class ContentProviderHelper {
// info and allow the caller to instantiate it. Only do
// this if the provider is the same user as the caller's
// process, or can run as root (so can be in any process).
return cpr.newHolder(null);
return cpr.newHolder(null, true);
}
if (ActivityManagerDebugConfig.DEBUG_PROVIDER) {
@@ -513,6 +514,38 @@ public class ContentProviderHelper {
UserHandle.getAppId(cpi.applicationInfo.uid));
}
if (caller != null) {
// The client will be waiting, and we'll notify it when the provider is ready.
synchronized (cpr) {
if (cpr.provider == null) {
if (cpr.launchingApp == null) {
Slog.w(TAG, "Unable to launch app "
+ cpi.applicationInfo.packageName + "/"
+ cpi.applicationInfo.uid + " for provider "
+ name + ": launching app became null");
EventLogTags.writeAmProviderLostProcess(
UserHandle.getUserId(cpi.applicationInfo.uid),
cpi.applicationInfo.packageName,
cpi.applicationInfo.uid, name);
return null;
}
if (conn != null) {
conn.waiting = true;
}
Message msg = mService.mHandler.obtainMessage(
ActivityManagerService.WAIT_FOR_CONTENT_PROVIDER_TIMEOUT_MSG);
msg.obj = cpr;
mService.mHandler.sendMessageDelayed(msg,
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 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...
final long timeout =
SystemClock.uptimeMillis() + ContentResolver.CONTENT_PROVIDER_READY_TIMEOUT_MILLIS;
@@ -569,7 +602,7 @@ public class ContentProviderHelper {
+ " caller=" + callerName + "/" + Binder.getCallingUid());
return null;
}
return cpr.newHolder(conn);
return cpr.newHolder(conn, false);
}
void publishContentProviders(IApplicationThread caller, List<ContentProviderHolder> providers) {
@@ -621,6 +654,8 @@ public class ContentProviderHelper {
}
}
if (wasInLaunchingProviders) {
mService.mHandler.removeMessages(
ActivityManagerService.WAIT_FOR_CONTENT_PROVIDER_TIMEOUT_MSG, dst);
mService.mHandler.removeMessages(
ActivityManagerService.CONTENT_PROVIDER_PUBLISH_TIMEOUT_MSG, r);
}
@@ -635,6 +670,7 @@ public class ContentProviderHelper {
dst.provider = src.provider;
dst.setProcess(r);
dst.notifyAll();
dst.onProviderPublishStatusLocked(true);
}
dst.mRestartCount = 0;
mService.updateOomAdjLocked(r, true, OomAdjuster.OOM_ADJ_REASON_GET_PROVIDER);
@@ -1504,6 +1540,9 @@ public class ContentProviderHelper {
synchronized (cpr) {
cpr.launchingApp = null;
cpr.notifyAll();
cpr.onProviderPublishStatusLocked(false);
mService.mHandler.removeMessages(
ActivityManagerService.WAIT_FOR_CONTENT_PROVIDER_TIMEOUT_MSG, cpr);
}
final int userId = UserHandle.getUserId(cpr.uid);
// Don't remove from provider map if it doesn't match

47
services/core/java/com/android/server/am/ContentProviderRecord.java
View File

@@ -85,11 +85,12 @@ final class ContentProviderRecord implements ComponentName.WithComponentName {
noReleaseNeeded = cpr.noReleaseNeeded;
}
public ContentProviderHolder newHolder(ContentProviderConnection conn) {
public ContentProviderHolder newHolder(ContentProviderConnection conn, boolean local) {
ContentProviderHolder holder = new ContentProviderHolder(info);
holder.provider = provider;
holder.noReleaseNeeded = noReleaseNeeded;
holder.connection = conn;
holder.mLocal = local;
return holder;
}
@@ -179,6 +180,50 @@ final class ContentProviderRecord implements ComponentName.WithComponentName {
return !connections.isEmpty() || hasExternalProcessHandles();
}
/**
* Notify all clients that the provider has been published and ready to use,
* or timed out.
*
* @param status true: successfully published; false: timed out
*/
void onProviderPublishStatusLocked(boolean status) {
final int numOfConns = connections.size();
final int userId = UserHandle.getUserId(appInfo.uid);
for (int i = 0; i < numOfConns; i++) {
final ContentProviderConnection conn = connections.get(i);
if (conn.waiting && conn.client != null) {
final ProcessRecord client = conn.client;
if (!status) {
if (launchingApp == null) {
Slog.w(TAG_AM, "Unable to launch app "
+ appInfo.packageName + "/"
+ appInfo.uid + " for provider "
+ info.authority + ": launching app became null");
EventLogTags.writeAmProviderLostProcess(
userId,
appInfo.packageName,
appInfo.uid, info.authority);
} else {
Slog.wtf(TAG_AM, "Timeout waiting for provider "
+ appInfo.packageName + "/"
+ appInfo.uid + " for provider "
+ info.authority
+ " caller=" + client);
}
}
if (client.thread != null) {
try {
client.thread.notifyContentProviderPublishStatus(
newHolder(status ? conn : null, false),
info.authority, userId, status);
} catch (RemoteException e) {
}
}
}
conn.waiting = false;
}
}
void dump(PrintWriter pw, String prefix, boolean full) {
if (full) {
pw.print(prefix); pw.print("package=");