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

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

Change-Id: I1364ec5817e508efbbdca5f7cabacaed97bd68dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bernardo Rufino
2022-06-02 15:45:28 +00:00
committed by Automerger Merge Worker

View File

@@ -241,6 +241,9 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
private void sendPendingIntent(int displayId, PendingIntent pendingIntent) private void sendPendingIntent(int displayId, PendingIntent pendingIntent)
throws PendingIntent.CanceledException { throws PendingIntent.CanceledException {
final ActivityOptions options = ActivityOptions.makeBasic().setLaunchDisplayId(displayId);
options.setPendingIntentBackgroundActivityLaunchAllowed(true);
options.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true);
pendingIntent.send( pendingIntent.send(
mContext, mContext,
/* code= */ 0, /* code= */ 0,
@@ -248,9 +251,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
/* onFinished= */ null, /* onFinished= */ null,
/* handler= */ null, /* handler= */ null,
/* requiredPermission= */ null, /* requiredPermission= */ null,
ActivityOptions.makeBasic() options.toBundle());
.setLaunchDisplayId(displayId)
.toBundle());
} }
@Override // Binder call @Override // Binder call