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

Commit b1bdd1c7 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Remove redundant CREATE_VIRTUAL_DEVICE permission enforcement 

Only keep it for VirtualDeviceManager#createVirtualDevice.

All other references are redundant because there's already a
VirtualDevice object.

Adding checks to all sensitive VD methods that the caller is
in fact the VD owner.

Test: presubmit
Fix: 371938922
Flag: EXEMPT bugfix
Change-Id: Ic3bb36dee41c6b92562d4dfe0e2e85a44bfc0d31
parent b13bfab3

core/api/system-current.txt

+49 −49
Original line number Diff line number Diff line
@@ -3489,41 +3489,41 @@ package android.companion.virtual { 














  public static class VirtualDeviceManager.VirtualDevice implements java.lang.AutoCloseable {















    method public void addActivityListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.ActivityListener);













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













    method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void addActivityPolicyExemption(@NonNull android.companion.virtual.ActivityPolicyExemption);













    method @FlaggedApi("android.companion.virtual.flags.dynamic_policy") public void addActivityPolicyExemption(@NonNull android.content.ComponentName);













    method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public void addActivityPolicyExemption(@NonNull android.companion.virtual.ActivityPolicyExemption);















    method public void addSoundEffectListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.SoundEffectListener);













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method public void close();















    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 @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);













    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.input.VirtualMouseConfig);













    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);













    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualNavigationTouchpad createVirtualNavigationTouchpad(@NonNull android.hardware.input.VirtualNavigationTouchpadConfig);













    method @FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualRotaryEncoder createVirtualRotaryEncoder(@NonNull android.hardware.input.VirtualRotaryEncoderConfig);













    method @FlaggedApi("android.companion.virtual.flags.virtual_stylus") @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualStylus createVirtualStylus(@NonNull android.hardware.input.VirtualStylusConfig);













    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.input.VirtualTouchscreenConfig);













    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 @NonNull 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 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 @NonNull public android.hardware.input.VirtualDpad createVirtualDpad(@NonNull android.hardware.input.VirtualDpadConfig);













    method @NonNull public android.hardware.input.VirtualKeyboard createVirtualKeyboard(@NonNull android.hardware.input.VirtualKeyboardConfig);













    method @Deprecated @NonNull public android.hardware.input.VirtualKeyboard createVirtualKeyboard(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);













    method @NonNull public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.input.VirtualMouseConfig);













    method @Deprecated @NonNull public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);













    method @NonNull public android.hardware.input.VirtualNavigationTouchpad createVirtualNavigationTouchpad(@NonNull android.hardware.input.VirtualNavigationTouchpadConfig);













    method @FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") @NonNull public android.hardware.input.VirtualRotaryEncoder createVirtualRotaryEncoder(@NonNull android.hardware.input.VirtualRotaryEncoderConfig);













    method @FlaggedApi("android.companion.virtual.flags.virtual_stylus") @NonNull public android.hardware.input.VirtualStylus createVirtualStylus(@NonNull android.hardware.input.VirtualStylusConfig);













    method @NonNull public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.input.VirtualTouchscreenConfig);













    method @Deprecated @NonNull 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 @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 @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 @NonNull public java.util.List<android.companion.virtual.sensor.VirtualSensor> getVirtualSensorList();













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













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













    method 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);













    method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void removeActivityPolicyExemption(@NonNull android.companion.virtual.ActivityPolicyExemption);













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













    method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public void removeActivityPolicyExemption(@NonNull android.companion.virtual.ActivityPolicyExemption);















    method public void removeSoundEffectListener(@NonNull android.companion.virtual.VirtualDeviceManager.SoundEffectListener);













    method @FlaggedApi("android.companion.virtual.flags.dynamic_policy") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void setDevicePolicy(int, int);













    method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void setDevicePolicy(int, int, int);













    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void setDisplayImePolicy(int, int);













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void setShowPointerIcon(boolean);













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void unregisterIntentInterceptor(@NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);













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













    method @FlaggedApi("android.companion.virtual.flags.dynamic_policy") public void setDevicePolicy(int, int);













    method @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public void setDevicePolicy(int, int, int);













    method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public void setDisplayImePolicy(int, int);













    method public void setShowPointerIcon(boolean);













    method public void unregisterIntentInterceptor(@NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);













    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public void wakeUp();















  }





























  public final class VirtualDeviceParams implements android.os.Parcelable {










@@ -3632,7 +3632,7 @@ package android.companion.virtual.audio {













package android.companion.virtual.camera {





























  @FlaggedApi("android.companion.virtual.flags.virtual_camera") public final class VirtualCamera implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method public void close();















    method @NonNull public android.companion.virtual.camera.VirtualCameraConfig getConfig();















  }
























@@ -3684,7 +3684,7 @@ package android.companion.virtual.sensor {













    method public int getDeviceId();















    method @NonNull public String getName();















    method public int getType();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendEvent(@NonNull android.companion.virtual.sensor.VirtualSensorEvent);













    method public void sendEvent(@NonNull android.companion.virtual.sensor.VirtualSensorEvent);















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.companion.virtual.sensor.VirtualSensor> CREATOR;















  }










@@ -5695,8 +5695,8 @@ package android.hardware.hdmi {













package android.hardware.input {





























  public class VirtualDpad implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendKeyEvent(@NonNull android.hardware.input.VirtualKeyEvent);













    method public void close();













    method public void sendKeyEvent(@NonNull android.hardware.input.VirtualKeyEvent);















  }





























  public final class VirtualDpadConfig extends android.hardware.input.VirtualInputDeviceConfig implements android.os.Parcelable {










@@ -5747,8 +5747,8 @@ package android.hardware.input {













  }





























  public class VirtualKeyboard implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendKeyEvent(@NonNull android.hardware.input.VirtualKeyEvent);













    method public void close();













    method public void sendKeyEvent(@NonNull android.hardware.input.VirtualKeyEvent);















  }





























  public final class VirtualKeyboardConfig extends android.hardware.input.VirtualInputDeviceConfig implements android.os.Parcelable {









@@ -5769,11 +5769,11 @@ package android.hardware.input {













  }





























  public class VirtualMouse implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.graphics.PointF getCursorPosition();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendButtonEvent(@NonNull android.hardware.input.VirtualMouseButtonEvent);













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendRelativeEvent(@NonNull android.hardware.input.VirtualMouseRelativeEvent);













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendScrollEvent(@NonNull android.hardware.input.VirtualMouseScrollEvent);













    method public void close();













    method @NonNull public android.graphics.PointF getCursorPosition();













    method public void sendButtonEvent(@NonNull android.hardware.input.VirtualMouseButtonEvent);













    method public void sendRelativeEvent(@NonNull android.hardware.input.VirtualMouseRelativeEvent);













    method public void sendScrollEvent(@NonNull android.hardware.input.VirtualMouseScrollEvent);















  }





























  public final class VirtualMouseButtonEvent implements android.os.Parcelable {










@@ -5846,8 +5846,8 @@ package android.hardware.input {













  }





























  public class VirtualNavigationTouchpad implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendTouchEvent(@NonNull android.hardware.input.VirtualTouchEvent);













    method public void close();













    method public void sendTouchEvent(@NonNull android.hardware.input.VirtualTouchEvent);















  }





























  public final class VirtualNavigationTouchpadConfig extends android.hardware.input.VirtualInputDeviceConfig implements android.os.Parcelable {









@@ -5864,8 +5864,8 @@ package android.hardware.input {













  }





























  @FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") public class VirtualRotaryEncoder implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendScrollEvent(@NonNull android.hardware.input.VirtualRotaryEncoderScrollEvent);













    method public void close();













    method public void sendScrollEvent(@NonNull android.hardware.input.VirtualRotaryEncoderScrollEvent);















  }





























  @FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") public final class VirtualRotaryEncoderConfig extends android.hardware.input.VirtualInputDeviceConfig implements android.os.Parcelable {










@@ -5895,9 +5895,9 @@ package android.hardware.input {













  }





























  @FlaggedApi("android.companion.virtual.flags.virtual_stylus") public class VirtualStylus implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendButtonEvent(@NonNull android.hardware.input.VirtualStylusButtonEvent);













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendMotionEvent(@NonNull android.hardware.input.VirtualStylusMotionEvent);













    method public void close();













    method public void sendButtonEvent(@NonNull android.hardware.input.VirtualStylusButtonEvent);













    method public void sendMotionEvent(@NonNull android.hardware.input.VirtualStylusMotionEvent);















  }





























  @FlaggedApi("android.companion.virtual.flags.virtual_stylus") public final class VirtualStylusButtonEvent implements android.os.Parcelable {










@@ -6000,8 +6000,8 @@ package android.hardware.input {













  }





























  public class VirtualTouchscreen implements java.io.Closeable {













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();













    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendTouchEvent(@NonNull android.hardware.input.VirtualTouchEvent);













    method public void close();













    method public void sendTouchEvent(@NonNull android.hardware.input.VirtualTouchEvent);















  }





























  public final class VirtualTouchscreenConfig extends android.hardware.input.VirtualInputDeviceConfig implements android.os.Parcelable {

























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



+0
−40


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+0
−24




























Original line number
Diff line number
Diff line








@@ -26,7 +26,6 @@ import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_RECENTS;













import android.annotation.CallbackExecutor;















import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.RequiresPermission;















import android.annotation.UserIdInt;















import android.app.PendingIntent;















import android.companion.virtual.audio.VirtualAudioDevice;










@@ -242,7 +241,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    List<VirtualSensor> getVirtualSensorList() {















        try {









@@ -252,7 +250,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void goToSleep() {















        try {















            mVirtualDevice.goToSleep();









@@ -261,7 +258,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void wakeUp() {















        try {















            mVirtualDevice.wakeUp();









@@ -270,7 +266,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void launchPendingIntent(















            int displayId,















            @NonNull PendingIntent pendingIntent,









@@ -292,7 +287,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @Nullable















    VirtualDisplay createVirtualDisplay(















            @NonNull VirtualDisplayConfig config,









@@ -310,7 +304,6 @@ public class VirtualDeviceInternal {













        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.









@@ -324,7 +317,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void setDevicePolicy(@VirtualDeviceParams.DynamicPolicyType int policyType,















            @VirtualDeviceParams.DevicePolicy int devicePolicy) {















        switch (policyType) {









@@ -344,7 +336,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void addActivityPolicyExemption(@NonNull ActivityPolicyExemption exemption) {















        try {















            mVirtualDevice.addActivityPolicyExemption(exemption);









@@ -353,7 +344,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void removeActivityPolicyExemption(@NonNull ActivityPolicyExemption exemption) {















        try {















            mVirtualDevice.removeActivityPolicyExemption(exemption);









@@ -362,7 +352,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void setDevicePolicyForDisplay(int displayId,















            @VirtualDeviceParams.DynamicDisplayPolicyType int policyType,















            @VirtualDeviceParams.DevicePolicy int devicePolicy) {









@@ -382,7 +371,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualDpad createVirtualDpad(@NonNull VirtualDpadConfig config) {















        try {









@@ -395,7 +383,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualKeyboard createVirtualKeyboard(@NonNull VirtualKeyboardConfig config) {















        try {









@@ -408,7 +395,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualMouse createVirtualMouse(@NonNull VirtualMouseConfig config) {















        try {









@@ -421,7 +407,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualTouchscreen createVirtualTouchscreen(















            @NonNull VirtualTouchscreenConfig config) {









@@ -435,7 +420,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualStylus createVirtualStylus(@NonNull VirtualStylusConfig config) {















        try {









@@ -448,7 +432,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualRotaryEncoder createVirtualRotaryEncoder(@NonNull VirtualRotaryEncoderConfig config) {















        try {









@@ -461,7 +444,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualNavigationTouchpad createVirtualNavigationTouchpad(















            @NonNull VirtualNavigationTouchpadConfig config) {









@@ -476,7 +458,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualAudioDevice createVirtualAudioDevice(















            @NonNull VirtualDisplay display,









@@ -501,7 +482,6 @@ public class VirtualDeviceInternal {













        return mVirtualAudioDevice;















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    @NonNull















    VirtualCamera createVirtualCamera(@NonNull VirtualCameraConfig config) {















        try {









@@ -513,7 +493,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void setShowPointerIcon(boolean showPointerIcon) {















        try {















            mVirtualDevice.setShowPointerIcon(showPointerIcon);









@@ -522,7 +501,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















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















        try {















            mVirtualDevice.setDisplayImePolicy(displayId, policy);










@@ -564,7 +542,6 @@ public class VirtualDeviceInternal {













        }















    }





























    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    void registerIntentInterceptor(















            @NonNull IntentFilter interceptorFilter,















            @CallbackExecutor @NonNull Executor executor,









@@ -584,7 +561,6 @@ 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



+0
−29


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/companion/virtual/camera/VirtualCamera.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.companion.virtual.camera;































import android.annotation.FlaggedApi;













import android.annotation.RequiresPermission;















import android.annotation.SuppressLint;















import android.annotation.SystemApi;















import android.annotation.TestApi;










@@ -94,7 +93,6 @@ public final class VirtualCamera implements Closeable {













    }































    @Override













    @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)















    public void close() {















        try {















            mVirtualDevice.unregisterVirtualCamera(mConfig);