am c413d54c: Merge change 26573 into eclair

Merge commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3' into eclair-plus-aosp

* commit 'c413d54cd9283778e6d73965a1d1d5f63ba62ec3':
  Fix bug where onStartCommand() was never called with a null intent.
This commit is contained in:
Dianne Hackborn
2009-09-23 01:05:01 -07:00
committed by Android Git Automerger
2 changed files with 29 additions and 12 deletions

View File

@@ -10209,7 +10209,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
ServiceRecord.StartItem si = r.pendingStarts.get(i);
if (DEBUG_SERVICE) Log.v(TAG, "Sending arguments to service: "
+ r.name + " " + r.intent + " args=" + si.intent);
if (si.intent == null && N > 0) {
if (si.intent == null && N > 1) {
// If somehow we got a dummy start at the front, then
// just drop it here.
i++;