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

am 0c3154d3: Fix issue #2163654: deadlock, runtime restart

Browse Source 
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
This commit is contained in:
Dianne Hackborn
2009-10-07 12:08:20 -07:00
committed by Android Git Automerger
parent 3d302c8673 0c3154d3fc
commit 7a889217d7
3 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -7543,8 +7543,13 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
if (DEBUG_PROVIDER) Log.v(TAG,
"Adding provider requested by "
+ r.processName + " from process "
+ cpr.info.processName);
r.conProviders.add(cpr);
+ cpr.info.processName);
Integer cnt = r.conProviders.get(cpr);
if (cnt == null) {
r.conProviders.put(cpr, new Integer(1));
} else {
r.conProviders.put(cpr, new Integer(cnt.intValue()+1));
}
cpr.clients.add(r);
} else {
cpr.externals++;
@@ -7649,8 +7654,13 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
if (DEBUG_PROVIDER) Log.v(TAG,
"Adding provider requested by "
+ r.processName + " from process "
+ cpr.info.processName);
r.conProviders.add(cpr);
+ cpr.info.processName);
Integer cnt = r.conProviders.get(cpr);
if (cnt == null) {
r.conProviders.put(cpr, new Integer(1));
} else {
r.conProviders.put(cpr, new Integer(cnt.intValue()+1));
}
cpr.clients.add(r);
} else {
cpr.externals++;
@@ -7727,8 +7737,13 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
+ cpr.info.name + " in process " + r.processName);
return;
} else {
localCpr.clients.remove(r);
r.conProviders.remove(localCpr);
Integer cnt = r.conProviders.get(localCpr);
if (cnt == null || cnt.intValue() <= 1) {
localCpr.clients.remove(r);
r.conProviders.remove(localCpr);
} else {
r.conProviders.put(localCpr, new Integer(cnt.intValue()-1));
}
}
updateOomAdjLocked();
}
@@ -9915,7 +9930,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
// Unregister from connected content providers.
if (!app.conProviders.isEmpty()) {
Iterator it = app.conProviders.iterator();
Iterator it = app.conProviders.keySet().iterator();
while (it.hasNext()) {
ContentProviderRecord cpr = (ContentProviderRecord)it.next();
cpr.clients.remove(app);