Merge "Fix Issue 26574: Service's onStartCommand receiving incorrect flag..." into jb-dev

Dianne Hackborn · Android (Google) Code Review · commit a4e2ec64db89 · 2012-05-08T17:19:15.000-07:00
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -11057,7 +11057,7 @@ private final void sendServiceArgsLocked(ServiceRecord r,
                     updateOomAdjLocked(r.app);
                 }
                 int flags = 0;
-                if (si.deliveryCount > 0) {
+                if (si.deliveryCount > 1) {
                     flags |= Service.START_FLAG_RETRY;
                 }
                 if (si.doneExecutingCount > 0) {

Original file line number	Diff line number	Diff line change
`@@ -11057,7 +11057,7 @@ private final void sendServiceArgsLocked(ServiceRecord r,`
`11057`	`11057`	`updateOomAdjLocked(r.app);`
`11058`	`11058`	`}`
`11059`	`11059`	`int flags = 0;`
`11060`		`- if (si.deliveryCount > 0) {`
	`11060`	`+ if (si.deliveryCount > 1) {`
`11061`	`11061`	`flags \|= Service.START_FLAG_RETRY;`
`11062`	`11062`	`}`
`11063`	`11063`	`if (si.doneExecutingCount > 0) {`