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

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

Merge "Make VDM APIs and permission annotations consistent" into main

parents f21cc714 d86d0ced

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -3495,8 +3495,8 @@ package android.companion.virtual { 
    method @NonNull public android.content.Context createContext();

    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.audio.VirtualAudioDevice createVirtualAudioDevice(@NonNull android.hardware.display.VirtualDisplay, @Nullable java.util.concurrent.Executor, @Nullable android.companion.virtual.audio.VirtualAudioDevice.AudioConfigurationChangeCallback);

    method @FlaggedApi("android.companion.virtual.flags.virtual_camera") @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.camera.VirtualCamera createVirtualCamera(@NonNull android.companion.virtual.camera.VirtualCameraConfig);

    method @Deprecated @Nullable public android.hardware.display.VirtualDisplay createVirtualDisplay(@IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int, @Nullable android.view.Surface, int, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.display.VirtualDisplay.Callback);

    method @Nullable public android.hardware.display.VirtualDisplay createVirtualDisplay(@NonNull android.hardware.display.VirtualDisplayConfig, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.display.VirtualDisplay.Callback);

    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.display.VirtualDisplay createVirtualDisplay(@IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int, @Nullable android.view.Surface, int, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.display.VirtualDisplay.Callback);

    method @Nullable @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.display.VirtualDisplay createVirtualDisplay(@NonNull android.hardware.display.VirtualDisplayConfig, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.display.VirtualDisplay.Callback);

    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualDpad createVirtualDpad(@NonNull android.hardware.input.VirtualDpadConfig);

    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualKeyboard createVirtualKeyboard(@NonNull android.hardware.input.VirtualKeyboardConfig);

    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualKeyboard createVirtualKeyboard(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
@@ -3509,9 +3509,9 @@ package android.companion.virtual { 
    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);

    method public int getDeviceId();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @Nullable public String getPersistentDeviceId();

    method @NonNull public java.util.List<android.companion.virtual.sensor.VirtualSensor> getVirtualSensorList();

    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public java.util.List<android.companion.virtual.sensor.VirtualSensor> getVirtualSensorList();

    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void goToSleep();

    method public void launchPendingIntent(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);

    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void launchPendingIntent(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);

    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void registerIntentInterceptor(@NonNull android.content.IntentFilter, @NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);

    method public void removeActivityListener(@NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener);

    method @FlaggedApi("android.companion.virtual.flags.dynamic_policy") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull android.content.ComponentName);

core/java/android/companion/virtual/IVirtualDevice.aidl

+12 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.content.ComponentName; 
import android.content.IntentFilter;

import android.graphics.Point;

import android.graphics.PointF;

import android.hardware.display.IVirtualDisplayCallback;

import android.hardware.display.VirtualDisplayConfig;

import android.hardware.input.VirtualDpadConfig;

import android.hardware.input.VirtualKeyboardConfig;

import android.hardware.input.VirtualKeyEvent;
@@ -148,6 +150,13 @@ interface IVirtualDevice { 
    @EnforcePermission("CREATE_VIRTUAL_DEVICE")

    void onAudioSessionEnded();



    /**

     * Creates a virtual display and registers it with the display framework.

     */

    @EnforcePermission("CREATE_VIRTUAL_DEVICE")

    int createVirtualDisplay(in VirtualDisplayConfig virtualDisplayConfig,

            in IVirtualDisplayCallback callback);



    /**

     * Creates a new dpad and registers it with the input framework with the given token.

     */
@@ -201,6 +210,7 @@ interface IVirtualDevice { 
     * Returns the ID of the device corresponding to the given token, as registered with the input

     * framework.

     */

    @EnforcePermission("CREATE_VIRTUAL_DEVICE")

    int getInputDeviceId(IBinder token);



    /**
@@ -272,6 +282,7 @@ interface IVirtualDevice { 
    /**

     * Launches a pending intent on the given display that is owned by this virtual device.

     */

    @EnforcePermission("CREATE_VIRTUAL_DEVICE")

    void launchPendingIntent(int displayId, in PendingIntent pendingIntent,

            in ResultReceiver resultReceiver);
@@ -279,6 +290,7 @@ interface IVirtualDevice { 
     * Returns the current cursor position of the mouse corresponding to the given token, in x and y

     * coordinates.

     */

    @EnforcePermission("CREATE_VIRTUAL_DEVICE")

    PointF getCursorPosition(IBinder token);



    /** Sets whether to show or hide the cursor while this virtual device is active. */

core/java/android/companion/virtual/IVirtualDeviceManager.aidl

+0 −14
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.companion.virtual.IVirtualDeviceSoundEffectListener; 
import android.companion.virtual.VirtualDevice;

import android.companion.virtual.VirtualDeviceParams;

import android.content.AttributionSource;

import android.hardware.display.IVirtualDisplayCallback;

import android.hardware.display.VirtualDisplayConfig;



/**

 * Interface for communication between VirtualDeviceManager and VirtualDeviceManagerService.
@@ -95,18 +93,6 @@ interface IVirtualDeviceManager { 
     */

    int getDevicePolicy(int deviceId, int policyType);



    /**

     * Creates a virtual display owned by a particular virtual device.

     *

     * @param virtualDisplayConfig The configuration used in creating the display

     * @param callback A callback that receives display lifecycle events

     * @param virtualDevice The device that will own this display

     * @param packageName The package name of the calling app

     */

    int createVirtualDisplay(in VirtualDisplayConfig virtualDisplayConfig,

            in IVirtualDisplayCallback callback, in IVirtualDevice virtualDevice,

            String packageName);



    /**

     * Returns device-specific session id for playback, or AUDIO_SESSION_ID_GENERATE

     * if there's none.

core/java/android/companion/virtual/VirtualDeviceInternal.java

+20 −4
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @NonNull

    List<VirtualSensor> getVirtualSensorList() {

        try {
@@ -269,6 +270,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void launchPendingIntent(

            int displayId,

            @NonNull PendingIntent pendingIntent,
@@ -290,6 +292,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @Nullable

    VirtualDisplay createVirtualDisplay(

            @NonNull VirtualDisplayConfig config,
@@ -299,16 +302,15 @@ public class VirtualDeviceInternal { 
                new DisplayManagerGlobal.VirtualDisplayCallback(callback, executor);

        final int displayId;

        try {

            displayId = mService.createVirtualDisplay(config, callbackWrapper, mVirtualDevice,

                    mContext.getPackageName());

            displayId = mVirtualDevice.createVirtualDisplay(config, callbackWrapper);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

        DisplayManagerGlobal displayManager = DisplayManagerGlobal.getInstance();

        return displayManager.createVirtualDisplayWrapper(config, callbackWrapper,

                displayId);

        return displayManager.createVirtualDisplayWrapper(config, callbackWrapper, displayId);

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void close() {

        try {

            // This also takes care of unregistering all virtual sensors.
@@ -322,6 +324,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void setDevicePolicy(@VirtualDeviceParams.DynamicPolicyType int policyType,

            @VirtualDeviceParams.DevicePolicy int devicePolicy) {

        switch (policyType) {
@@ -341,6 +344,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void addActivityPolicyExemption(@NonNull ActivityPolicyExemption exemption) {

        try {

            mVirtualDevice.addActivityPolicyExemption(exemption);
@@ -349,6 +353,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void removeActivityPolicyExemption(@NonNull ActivityPolicyExemption exemption) {

        try {

            mVirtualDevice.removeActivityPolicyExemption(exemption);
@@ -357,6 +362,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void setDevicePolicyForDisplay(int displayId,

            @VirtualDeviceParams.DynamicDisplayPolicyType int policyType,

            @VirtualDeviceParams.DevicePolicy int devicePolicy) {
@@ -376,6 +382,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @NonNull

    VirtualDpad createVirtualDpad(@NonNull VirtualDpadConfig config) {

        try {
@@ -388,6 +395,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @NonNull

    VirtualKeyboard createVirtualKeyboard(@NonNull VirtualKeyboardConfig config) {

        try {
@@ -400,6 +408,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @NonNull

    VirtualMouse createVirtualMouse(@NonNull VirtualMouseConfig config) {

        try {
@@ -412,6 +421,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @NonNull

    VirtualTouchscreen createVirtualTouchscreen(

            @NonNull VirtualTouchscreenConfig config) {
@@ -451,6 +461,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @NonNull

    VirtualNavigationTouchpad createVirtualNavigationTouchpad(

            @NonNull VirtualNavigationTouchpadConfig config) {
@@ -465,6 +476,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    @NonNull

    VirtualAudioDevice createVirtualAudioDevice(

            @NonNull VirtualDisplay display,
@@ -501,6 +513,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void setShowPointerIcon(boolean showPointerIcon) {

        try {

            mVirtualDevice.setShowPointerIcon(showPointerIcon);
@@ -509,6 +522,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void setDisplayImePolicy(int displayId, @WindowManager.DisplayImePolicy int policy) {

        try {

            mVirtualDevice.setDisplayImePolicy(displayId, policy);
@@ -550,6 +564,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void registerIntentInterceptor(

            @NonNull IntentFilter interceptorFilter,

            @CallbackExecutor @NonNull Executor executor,
@@ -569,6 +584,7 @@ public class VirtualDeviceInternal { 
        }

    }



    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

    void unregisterIntentInterceptor(

            @NonNull VirtualDeviceManager.IntentInterceptorCallback interceptorCallback) {

        Objects.requireNonNull(interceptorCallback);

core/java/android/companion/virtual/VirtualDeviceManager.java

+4 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ public final class VirtualDeviceManager { 
         *

         * @return A list of all sensors for this device, or an empty list if no sensors exist.

         */

        @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

        @NonNull

        public List<VirtualSensor> getVirtualSensorList() {

            return mVirtualDeviceInternal.getVirtualSensorList();
@@ -676,6 +677,7 @@ public final class VirtualDeviceManager { 
         *   on the virtual display, or one of the {@code LAUNCH_FAILED} status explaining why it

         *   failed.

         */

        @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

        public void launchPendingIntent(

                int displayId,

                @NonNull PendingIntent pendingIntent,
@@ -716,6 +718,7 @@ public final class VirtualDeviceManager { 
         * VirtualDisplay.Callback)}

         */

        @Deprecated

        @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

        @Nullable

        public VirtualDisplay createVirtualDisplay(

                @IntRange(from = 1) int width,
@@ -753,6 +756,7 @@ public final class VirtualDeviceManager { 
         *

         * @see DisplayManager#createVirtualDisplay

         */

        @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)

        @Nullable

        public VirtualDisplay createVirtualDisplay(

                @NonNull VirtualDisplayConfig config,