Fix bug where onStartCommand() was never called with a null intent.

Also clean up some of the service java docs. Change-Id: I40e7d713e2393f7ee1db9822da8f07fb6304a9e4
2009-09-23 00:42:12 -07:00
parent d2cd9467b8
commit fed534ee5d
2 changed files with 29 additions and 12 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -10208,7 +10208,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++;