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

Commit bdf2aefe authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

Merge "Let virtualdevice.launchPendingIntent() to start BAL using its BAL... 

Merge "Let virtualdevice.launchPendingIntent() to start BAL using its BAL permission" into tm-dev am: a207130f am: 75cdfa45

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



Change-Id: Id406a51ad826bd91e13279863f903e32780035e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d8f433a 75cdfa45

services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -241,6 +241,9 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 


    private void sendPendingIntent(int displayId, PendingIntent pendingIntent)

            throws PendingIntent.CanceledException {

        final ActivityOptions options = ActivityOptions.makeBasic().setLaunchDisplayId(displayId);

        options.setPendingIntentBackgroundActivityLaunchAllowed(true);

        options.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true);

        pendingIntent.send(

                mContext,

                /* code= */ 0,
@@ -248,9 +251,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
                /* onFinished= */ null,

                /* handler= */ null,

                /* requiredPermission= */ null,

                ActivityOptions.makeBasic()

                        .setLaunchDisplayId(displayId)

                        .toBundle());

                options.toBundle());

    }



    @Override // Binder call