From 68d881cf2d2b252f6f795cd64d43e316a1d736e5 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 5 Oct 2009 13:58:17 -0700 Subject: 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 --- cmds/am/src/com/android/commands/am/Am.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmds/am') 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; -- cgit v1.1