Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a15bd8a9 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix build." into jb-mr1-dev

parents e25081c4 52fba38f

cmds/am/src/com/android/commands/am/Am.java

+3 −3
Original line number Diff line number Diff line
@@ -1181,9 +1181,9 @@ public class Am { 
    private class IntentReceiver extends IIntentReceiver.Stub {

        private boolean mFinished = false;



        public synchronized void performReceive(

                Intent intent, int rc, String data, Bundle ext, boolean ord,

                boolean sticky) {

        @Override

        public void performReceive(Intent intent, int resultCode, String data, Bundle extras,

                boolean ordered, boolean sticky, int sendingUser) throws RemoteException {

            String line = "Broadcast completed: result=" + rc;

            if (data != null) line = line + ", data=\"" + data + "\"";

            if (ext != null) line = line + ", extras: " + ext;