summaryrefslogtreecommitdiffstats
path: root/cmds/am
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-10-05 13:58:17 -0700
committerDianne Hackborn <hackbod@google.com>2009-10-05 15:52:32 -0700
commit68d881cf2d2b252f6f795cd64d43e316a1d736e5 (patch)
tree3d0f7cb91e612df7a5663ceefec0b5439c907642 /cmds/am
parent71060f29855745893c122e8b93cf7a723186931b (diff)
downloadframeworks_base-68d881cf2d2b252f6f795cd64d43e316a1d736e5.zip
frameworks_base-68d881cf2d2b252f6f795cd64d43e316a1d736e5.tar.gz
frameworks_base-68d881cf2d2b252f6f795cd64d43e316a1d736e5.tar.bz2
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Tell the broadcast receiver whether it is getting an initial sticky value, so it will be quiet about attempts to do ordered broadcast stuff. Note that the original bug being reported was not actually a crash, just an error log. So all we are doing here is making the log quieter. Change-Id: Iaf1b718d82093ec1197142410a64feff47eb3859
Diffstat (limited to 'cmds/am')
-rw-r--r--cmds/am/src/com/android/commands/am/Am.java3
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;