drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo

Browse Source
This commit is contained in:
Jeff Hamilton
2010-05-27 09:39:19 -07:00
committed by Android (Google) Code Review
parent b3f3caef38 acf8474b68
commit dc46f6f6cc
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1106,7 +1106,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
mHandler.sendMessageDelayed(nmsg, BROADCAST_TIMEOUT);
return;
}
broadcastTimeout();
// Only process broadcast timeouts if the system is ready. That way
// PRE_BOOT_COMPLETED broadcasts can't timeout as they are intended
// to do heavy lifting for system up
if (mSystemReady) {
broadcastTimeout();
}
} break;
case PAUSE_TIMEOUT_MSG: {
IBinder token = (IBinder)msg.obj;
@ -13116,10 +13121,15 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
// Ensure that even if something goes awry with the timeout
// detection, we catch "hung" broadcasts here, discard them,
// and continue to make progress.
// and continue to make progress.
//
// This is only done if the system is ready so that PRE_BOOT_COMPLETED
// receivers don't get executed with with timeouts. They're intended for
// one time heavy lifting after system upgrades and can take
// significant amounts of time.
int numReceivers = (r.receivers != null) ? r.receivers.size() : 0;
long now = SystemClock.uptimeMillis();
if (r.dispatchTime > 0) {
if (mSystemReady && r.dispatchTime > 0) {
long now = SystemClock.uptimeMillis();
if ((numReceivers > 0) &&
(now > r.dispatchTime + (2*BROADCAST_TIMEOUT*numReceivers))) {
Slog.w(TAG, "Hung broadcast discarded after timeout failure:"