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

Commit 4a5c377a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace get/setPendingIntentBackgroundActivityLaunchAllowedByPermission" into main

parents e58104cd b26d009c

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

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_BLOCKED_ 
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_CAMERA;

import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_CLIPBOARD;

import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_RECENTS;

import static android.content.pm.PackageManager.ACTION_REQUEST_PERMISSIONS;

import static android.companion.virtualdevice.flags.Flags.virtualCameraServiceDiscovery;

import static android.companion.virtualdevice.flags.Flags.intentInterceptionActionMatchingFix;

import static android.content.pm.PackageManager.ACTION_REQUEST_PERMISSIONS;



import android.annotation.EnforcePermission;

import android.annotation.NonNull;
@@ -561,8 +561,8 @@ 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);

        options.setPendingIntentBackgroundActivityStartMode(

                ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS);

        pendingIntent.send(

                mContext,

                /* code= */ 0,