diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-09 10:10:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-09 10:10:43 -0700 |
| commit | f566efe04f95ac3c93be56cb15e8ab024214f2c0 (patch) | |
| tree | eea9963cdc4bbcac0c9d80fa4d1f1bea3db133a1 /services/java/com/android | |
| parent | 132a75f5cf8582ddb9436d508e5d615f50f820ca (diff) | |
| parent | dde27194ef0b3e88663554c878219c2784893919 (diff) | |
am dde27194: am a4e2ec64: Merge "Fix Issue 26574: Service\'s onStartCommand receiving incorrect flag..." into jb-dev
* commit 'dde27194ef0b3e88663554c878219c2784893919':
Fix Issue 26574: Service's onStartCommand receiving incorrect flag...
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index ab35ac26d82e..40f64bf047bd 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -11057,7 +11057,7 @@ public final class ActivityManagerService extends ActivityManagerNative updateOomAdjLocked(r.app); } int flags = 0; - if (si.deliveryCount > 0) { + if (si.deliveryCount > 1) { flags |= Service.START_FLAG_RETRY; } if (si.doneExecutingCount > 0) { |