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

Commit c82f9171 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Add logging when broadcast is sent using shell commands." into udc-dev... 

Merge "Add logging when broadcast is sent using shell commands." into udc-dev am: 8020b8b6 am: 572c813d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23175049



Change-Id: I7138ef661d30da3eb077f4b774a1f466c91c689e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0dfe135a 572c813d

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+5 −3
Original line number Diff line number Diff line
@@ -918,6 +918,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
    }



    int runSendBroadcast(PrintWriter pw) throws RemoteException {

        pw = new PrintWriter(new TeeWriter(LOG_WRITER_INFO, pw));

        Intent intent;

        try {

            intent = makeIntent(UserHandle.USER_CURRENT);
@@ -931,9 +932,10 @@ final class ActivityManagerShellCommand extends ShellCommand { 
        pw.println("Broadcasting: " + intent);

        pw.flush();

        Bundle bundle = mBroadcastOptions == null ? null : mBroadcastOptions.toBundle();

        mInterface.broadcastIntentWithFeature(null, null, intent, null, receiver, 0, null, null,

                requiredPermissions, null, null, android.app.AppOpsManager.OP_NONE, bundle, true,

                false, mUserId);

        final int result = mInterface.broadcastIntentWithFeature(null, null, intent, null,

                receiver, 0, null, null, requiredPermissions, null, null,

                android.app.AppOpsManager.OP_NONE, bundle, true, false, mUserId);

        Slogf.i(TAG, "Broadcasted %s: " + result, intent);

        if (!mAsync) {

            receiver.waitForFinish();

        }