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

Merge change Iff5b8ce3 into eclair

Browse Source 
* changes:
  Work on issue 2259506: camera ANRed and then device runtime restarted
This commit is contained in:
Android (Google) Code Review
2009-11-16 16:33:41 -08:00
parent dc49acb028 f670ef7235
commit ab5efde8dc
1 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,6 +185,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
static final int LOG_AM_SERVICE_CRASHED_TOO_MUCH = 30034; static final int LOG_AM_SERVICE_CRASHED_TOO_MUCH = 30034;
static final int LOG_AM_SCHEDULE_SERVICE_RESTART = 30035; static final int LOG_AM_SCHEDULE_SERVICE_RESTART = 30035;
static final int LOG_AM_PROVIDER_LOST_PROCESS = 30036; static final int LOG_AM_PROVIDER_LOST_PROCESS = 30036;
static final int LOG_AM_PROCESS_START_TIMEOUT = 30037;
static final int LOG_BOOT_PROGRESS_AMS_READY = 3040; static final int LOG_BOOT_PROGRESS_AMS_READY = 3040;
static final int LOG_BOOT_PROGRESS_ENABLE_SCREEN = 3050; static final int LOG_BOOT_PROGRESS_ENABLE_SCREEN = 3050;
@@ -5199,13 +5200,23 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
if (gone) { if (gone) {
Log.w(TAG, "Process " + app + " failed to attach"); Log.w(TAG, "Process " + app + " failed to attach");
EventLog.writeEvent(LOG_AM_PROCESS_START_TIMEOUT, pid, app.info.uid,
app.processName);
mProcessNames.remove(app.processName, app.info.uid); mProcessNames.remove(app.processName, app.info.uid);
Process.killProcess(pid); // Take care of any launching providers waiting for this process.
if (mPendingBroadcast != null && mPendingBroadcast.curApp.pid == pid) { checkAppInLaunchingProvidersLocked(app, true);
Log.w(TAG, "Unattached app died before broadcast acknowledged, skipping"); // Take care of any services that are waiting for the process.
mPendingBroadcast = null; for (int i=0; i<mPendingServices.size(); i++) {
scheduleBroadcastsLocked(); ServiceRecord sr = mPendingServices.get(i);
if (app.info.uid == sr.appInfo.uid
&& app.processName.equals(sr.processName)) {
Log.w(TAG, "Forcing bringing down service: " + sr);
mPendingServices.remove(i);
i--;
bringDownServiceLocked(sr, true);
}
} }
Process.killProcess(pid);
if (mBackupTarget != null && mBackupTarget.app.pid == pid) { if (mBackupTarget != null && mBackupTarget.app.pid == pid) {
Log.w(TAG, "Unattached app died before backup, skipping"); Log.w(TAG, "Unattached app died before backup, skipping");
try { try {
@@ -5216,6 +5227,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
// Can't happen; the backup manager is local // Can't happen; the backup manager is local
} }
} }
if (mPendingBroadcast != null && mPendingBroadcast.curApp.pid == pid) {
Log.w(TAG, "Unattached app died before broadcast acknowledged, skipping");
mPendingBroadcast = null;
scheduleBroadcastsLocked();
}
} else { } else {
Log.w(TAG, "Spurious process start timeout - pid not known for " + app); Log.w(TAG, "Spurious process start timeout - pid not known for " + app);
} }
@@ -9949,23 +9965,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
app.pubProviders.clear(); app.pubProviders.clear();
} }
// Look through the content providers we are waiting to have launched, // Take care of any launching providers waiting for this process.
// and if any run in this process then either schedule a restart of if (checkAppInLaunchingProvidersLocked(app, false)) {
// the process or kill the client waiting for it if this process has restart = true;
// gone bad.
for (int i=0; i<NL; i++) {
ContentProviderRecord cpr = (ContentProviderRecord)
mLaunchingProviders.get(i);
if (cpr.launchingApp == app) {
if (!app.bad) {
restart = true;
} else {
removeDyingProviderLocked(app, cpr);
NL = mLaunchingProviders.size();
}
}
} }
// Unregister from connected content providers. // Unregister from connected content providers.
if (!app.conProviders.isEmpty()) { if (!app.conProviders.isEmpty()) {
Iterator it = app.conProviders.keySet().iterator(); Iterator it = app.conProviders.keySet().iterator();
@@ -10060,6 +10064,28 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
} }
} }
boolean checkAppInLaunchingProvidersLocked(ProcessRecord app, boolean alwaysBad) {
// Look through the content providers we are waiting to have launched,
// and if any run in this process then either schedule a restart of
// the process or kill the client waiting for it if this process has
// gone bad.
int NL = mLaunchingProviders.size();
boolean restart = false;
for (int i=0; i<NL; i++) {
ContentProviderRecord cpr = (ContentProviderRecord)
mLaunchingProviders.get(i);
if (cpr.launchingApp == app) {
if (!alwaysBad && !app.bad) {
restart = true;
} else {
removeDyingProviderLocked(app, cpr);
NL = mLaunchingProviders.size();
}
}
}
return restart;
}
// ========================================================= // =========================================================
// SERVICES // SERVICES
// ========================================================= // =========================================================