diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-10-12 11:34:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-12 11:34:00 -0700 |
| commit | 9809d5149b883315c73aef197200eb9758d34134 (patch) | |
| tree | da9abce3d6e8159f61efee8701f7f0c7d4e16ada /cmds | |
| parent | 13683ab7d4c59c242d44f56f0e1576fee0b20976 (diff) | |
| parent | 4bc6158d6bdeff796cfd61d489c01db0d203534c (diff) | |
| download | frameworks_base-9809d5149b883315c73aef197200eb9758d34134.zip frameworks_base-9809d5149b883315c73aef197200eb9758d34134.tar.gz frameworks_base-9809d5149b883315c73aef197200eb9758d34134.tar.bz2 | |
am 4bc6158d: am baad552d: am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'
* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 0b4f25e..eca5af9 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -340,7 +340,8 @@ public class Am { private boolean mFinished = false; public synchronized void performReceive( - Intent intent, int rc, String data, Bundle ext, boolean ord) { + Intent intent, int rc, String data, Bundle ext, boolean ord, + boolean sticky) { String line = "Broadcast completed: result=" + rc; if (data != null) line = line + ", data=\"" + data + "\""; if (ext != null) line = line + ", extras: " + ext; |