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

Merge "Revert "Clean-up state if we have an exception when acquiring provider""

Browse Source
This commit is contained in:
Wale Ogunwale
2015-04-24 21:49:41 +00:00
committed by Gerrit Code Review
parent c71f264847 67fe0a450c
commit d9bf26522b
1 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,8 +261,6 @@ public final class ActivityThread {
IActivityManager.ContentProviderHolder holder; IActivityManager.ContentProviderHolder holder;
boolean acquiring = true; boolean acquiring = true;
int requests = 1; int requests = 1;
// Set if there was a runtime exception when trying to acquire the provider.
RuntimeException runtimeException = null;
} }
// The lock of mProviderMap protects the following variables. // The lock of mProviderMap protects the following variables.
@@ -4672,55 +4670,39 @@ public final class ActivityThread {
} }
IActivityManager.ContentProviderHolder holder = null; IActivityManager.ContentProviderHolder holder = null;
try { if (first) {
if (first) { // Multiple threads may try to acquire the same provider at the same time.
// Multiple threads may try to acquire the same provider at the same time. // When this happens, we only let the first one really gets provider.
// When this happens, we only let the first one really gets provider. // Other threads just wait for its result.
// Other threads just wait for its result. // Note that we cannot hold the lock while acquiring and installing the
// Note that we cannot hold the lock while acquiring and installing the // provider since it might take a long time to run and it could also potentially
// 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.
// be re-entrant in the case where the provider is in the same process. try {
holder = ActivityManagerNative.getDefault().getContentProvider( holder = ActivityManagerNative.getDefault().getContentProvider(
getApplicationThread(), auth, userId, stable); getApplicationThread(), auth, userId, stable);
} else { } catch (RemoteException ex) {
synchronized (r) {
while (r.acquiring) {
try {
r.wait();
} catch (InterruptedException e) {
}
}
holder = r.holder;
}
} }
} catch (RemoteException ex) {
} catch (RuntimeException e) {
synchronized (r) { synchronized (r) {
r.runtimeException = e; r.holder = holder;
r.acquiring = false;
r.notifyAll();
} }
} finally { } else {
if (first) { synchronized (r) {
synchronized (r) { while (r.acquiring) {
r.holder = holder; try {
r.acquiring = false; r.wait();
r.notifyAll(); } catch (InterruptedException e) {
}
} }
} holder = r.holder;
}
synchronized (mAcquiringProviderMap) { }
if (--r.requests == 0) { synchronized (mAcquiringProviderMap) {
mAcquiringProviderMap.remove(key); if (--r.requests == 0) {
} mAcquiringProviderMap.remove(key);
}
if (r.runtimeException != null) {
// Was set when the first thread tried to acquire the provider,
// but we should make sure it is thrown for all threads trying to
// acquire the provider.
throw r.runtimeException;
} }
} }
if (holder == null) { if (holder == null) {
Slog.e(TAG, "Failed to find provider info for " + auth); Slog.e(TAG, "Failed to find provider info for " + auth);
return null; return null;