diff options
12 files changed, 41 insertions, 88 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 41f286245d8d..83010018c459 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -3437,7 +3437,7 @@ package android.companion.virtual { method public void close(); method @NonNull public android.content.Context createContext(); 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 @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); @@ -3500,7 +3500,7 @@ package android.companion.virtual { field public static final int POLICY_TYPE_ACTIVITY = 3; // 0x3 field public static final int POLICY_TYPE_AUDIO = 1; // 0x1 field @FlaggedApi("android.companion.virtualdevice.flags.activity_control_api") public static final int POLICY_TYPE_BLOCKED_ACTIVITY = 6; // 0x6 - field @FlaggedApi("android.companion.virtual.flags.virtual_camera") public static final int POLICY_TYPE_CAMERA = 5; // 0x5 + field public static final int POLICY_TYPE_CAMERA = 5; // 0x5 field public static final int POLICY_TYPE_CLIPBOARD = 4; // 0x4 field @FlaggedApi("android.companion.virtualdevice.flags.default_device_camera_access_policy") public static final int POLICY_TYPE_DEFAULT_DEVICE_CAMERA_ACCESS = 7; // 0x7 field public static final int POLICY_TYPE_RECENTS = 2; // 0x2 @@ -3578,18 +3578,18 @@ 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 { + public final class VirtualCamera implements java.io.Closeable { method public void close(); method @NonNull public android.companion.virtual.camera.VirtualCameraConfig getConfig(); } - @FlaggedApi("android.companion.virtual.flags.virtual_camera") public interface VirtualCameraCallback { + public interface VirtualCameraCallback { method public default void onProcessCaptureRequest(int, long); method public void onStreamClosed(int); method public void onStreamConfigured(int, @NonNull android.view.Surface, @IntRange(from=1) int, @IntRange(from=1) int, int); } - @FlaggedApi("android.companion.virtual.flags.virtual_camera") public final class VirtualCameraConfig implements android.os.Parcelable { + public final class VirtualCameraConfig implements android.os.Parcelable { method public int describeContents(); method public int getLensFacing(); method @NonNull public String getName(); @@ -3603,7 +3603,7 @@ package android.companion.virtual.camera { field public static final int SENSOR_ORIENTATION_90 = 90; // 0x5a } - @FlaggedApi("android.companion.virtual.flags.virtual_camera") public static final class VirtualCameraConfig.Builder { + public static final class VirtualCameraConfig.Builder { ctor public VirtualCameraConfig.Builder(@NonNull String); method @NonNull public android.companion.virtual.camera.VirtualCameraConfig.Builder addStreamConfig(@IntRange(from=1) int, @IntRange(from=1) int, int, @IntRange(from=1) int); method @NonNull public android.companion.virtual.camera.VirtualCameraConfig build(); @@ -3612,7 +3612,7 @@ package android.companion.virtual.camera { method @NonNull public android.companion.virtual.camera.VirtualCameraConfig.Builder setVirtualCameraCallback(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.camera.VirtualCameraCallback); } - @FlaggedApi("android.companion.virtual.flags.virtual_camera") public final class VirtualCameraStreamConfig implements android.os.Parcelable { + public final class VirtualCameraStreamConfig implements android.os.Parcelable { method public int describeContents(); method public int getFormat(); method @IntRange(from=1) public int getHeight(); diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 7c1c86823110..861a88d709bc 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -934,7 +934,7 @@ package android.companion.virtual { package android.companion.virtual.camera { - @FlaggedApi("android.companion.virtual.flags.virtual_camera") public final class VirtualCamera implements java.io.Closeable { + public final class VirtualCamera implements java.io.Closeable { method @NonNull public String getId(); } diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java index 252db824c69f..ab52db4b7a30 100644 --- a/core/java/android/companion/virtual/VirtualDeviceManager.java +++ b/core/java/android/companion/virtual/VirtualDeviceManager.java @@ -37,8 +37,8 @@ import android.companion.virtual.audio.VirtualAudioDevice; import android.companion.virtual.audio.VirtualAudioDevice.AudioConfigurationChangeCallback; import android.companion.virtual.camera.VirtualCamera; import android.companion.virtual.camera.VirtualCameraConfig; -import android.companion.virtual.flags.Flags; import android.companion.virtual.sensor.VirtualSensor; +import android.companion.virtualdevice.flags.Flags; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -624,7 +624,7 @@ public final class VirtualDeviceManager { * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_TRUSTED * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + @FlaggedApi(Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) public void goToSleep() { mVirtualDeviceInternal.goToSleep(); } @@ -642,7 +642,7 @@ public final class VirtualDeviceManager { * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_TRUSTED * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + @FlaggedApi(Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) public void wakeUp() { mVirtualDeviceInternal.wakeUp(); } @@ -838,7 +838,7 @@ public final class VirtualDeviceManager { * @see #removeActivityPolicyExemption(ActivityPolicyExemption) * @see #setDevicePolicy */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) + @FlaggedApi(Flags.FLAG_ACTIVITY_CONTROL_API) public void addActivityPolicyExemption(@NonNull ActivityPolicyExemption exemption) { mVirtualDeviceInternal.addActivityPolicyExemption(Objects.requireNonNull(exemption)); } @@ -853,7 +853,7 @@ public final class VirtualDeviceManager { * @see #addActivityPolicyExemption(ActivityPolicyExemption) * @see #setDevicePolicy */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) + @FlaggedApi(Flags.FLAG_ACTIVITY_CONTROL_API) public void removeActivityPolicyExemption(@NonNull ActivityPolicyExemption exemption) { mVirtualDeviceInternal.removeActivityPolicyExemption(Objects.requireNonNull(exemption)); } @@ -875,7 +875,7 @@ public final class VirtualDeviceManager { * @see VirtualDeviceParams#POLICY_TYPE_RECENTS * @see VirtualDeviceParams#POLICY_TYPE_ACTIVITY */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) + @FlaggedApi(Flags.FLAG_ACTIVITY_CONTROL_API) public void setDevicePolicy( @VirtualDeviceParams.DynamicDisplayPolicyType int policyType, @VirtualDeviceParams.DevicePolicy int devicePolicy, @@ -1037,10 +1037,10 @@ public final class VirtualDeviceManager { * @see android.view.InputDevice#SOURCE_ROTARY_ENCODER */ @NonNull - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_VIRTUAL_ROTARY) + @FlaggedApi(Flags.FLAG_VIRTUAL_ROTARY) public VirtualRotaryEncoder createVirtualRotaryEncoder( @NonNull VirtualRotaryEncoderConfig config) { - if (!android.companion.virtualdevice.flags.Flags.virtualRotary()) { + if (!Flags.virtualRotary()) { throw new UnsupportedOperationException("Virtual rotary support not enabled"); } return mVirtualDeviceInternal.createVirtualRotaryEncoder(config); @@ -1084,12 +1084,7 @@ public final class VirtualDeviceManager { * @see VirtualDeviceParams#POLICY_TYPE_CAMERA */ @NonNull - @FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA) public VirtualCamera createVirtualCamera(@NonNull VirtualCameraConfig config) { - if (!Flags.virtualCamera()) { - throw new UnsupportedOperationException( - "Flag is not enabled: %s".formatted(Flags.FLAG_VIRTUAL_CAMERA)); - } return mVirtualDeviceInternal.createVirtualCamera(Objects.requireNonNull(config)); } @@ -1252,7 +1247,7 @@ public final class VirtualDeviceManager { * @see VirtualDeviceParams#POLICY_TYPE_ACTIVITY * @see VirtualDevice#addActivityPolicyExemption(ActivityPolicyExemption) */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) + @FlaggedApi(Flags.FLAG_ACTIVITY_CONTROL_API) default void onActivityLaunchBlocked(int displayId, @NonNull ComponentName componentName, @NonNull UserHandle user, @Nullable IntentSender intentSender) {} @@ -1268,7 +1263,7 @@ public final class VirtualDeviceManager { * @see Display#FLAG_SECURE * @see WindowManager.LayoutParams#FLAG_SECURE */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) + @FlaggedApi(Flags.FLAG_ACTIVITY_CONTROL_API) default void onSecureWindowShown(int displayId, @NonNull ComponentName componentName, @NonNull UserHandle user) {} @@ -1284,7 +1279,7 @@ public final class VirtualDeviceManager { * @see Display#FLAG_SECURE * @see WindowManager.LayoutParams#FLAG_SECURE */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) + @FlaggedApi(Flags.FLAG_ACTIVITY_CONTROL_API) default void onSecureWindowHidden(int displayId) {} } diff --git a/core/java/android/companion/virtual/VirtualDeviceParams.java b/core/java/android/companion/virtual/VirtualDeviceParams.java index 95dee9b72a88..699494790f35 100644 --- a/core/java/android/companion/virtual/VirtualDeviceParams.java +++ b/core/java/android/companion/virtual/VirtualDeviceParams.java @@ -29,12 +29,12 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; -import android.companion.virtual.flags.Flags; import android.companion.virtual.sensor.IVirtualSensorCallback; import android.companion.virtual.sensor.VirtualSensor; import android.companion.virtual.sensor.VirtualSensorCallback; import android.companion.virtual.sensor.VirtualSensorConfig; import android.companion.virtual.sensor.VirtualSensorDirectChannelCallback; +import android.companion.virtualdevice.flags.Flags; import android.content.ComponentName; import android.content.Context; import android.hardware.display.VirtualDisplayConfig; @@ -279,7 +279,6 @@ public final class VirtualDeviceParams implements Parcelable { * * @see Context#getDeviceId */ - @FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA) public static final int POLICY_TYPE_CAMERA = 5; /** @@ -296,7 +295,7 @@ public final class VirtualDeviceParams implements Parcelable { * </ul> */ // TODO(b/333443509): Link to POLICY_TYPE_ACTIVITY - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ACTIVITY_CONTROL_API) + @FlaggedApi(Flags.FLAG_ACTIVITY_CONTROL_API) public static final int POLICY_TYPE_BLOCKED_ACTIVITY = 6; /** @@ -310,8 +309,7 @@ public final class VirtualDeviceParams implements Parcelable { * * @see Context#DEVICE_ID_DEFAULT */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags - .FLAG_DEFAULT_DEVICE_CAMERA_ACCESS_POLICY) + @FlaggedApi(Flags.FLAG_DEFAULT_DEVICE_CAMERA_ACCESS_POLICY) public static final int POLICY_TYPE_DEFAULT_DEVICE_CAMERA_ACCESS = 7; private final int mLockState; @@ -407,7 +405,7 @@ public final class VirtualDeviceParams implements Parcelable { * * @see Builder#setDimDuration(Duration) */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + @FlaggedApi(Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) public @NonNull Duration getDimDuration() { return Duration.ofMillis(mDimDuration); } @@ -417,7 +415,7 @@ public final class VirtualDeviceParams implements Parcelable { * * @see Builder#setDimDuration(Duration) */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + @FlaggedApi(Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) public @NonNull Duration getScreenOffTimeout() { return Duration.ofMillis(mScreenOffTimeout); } @@ -876,7 +874,7 @@ public final class VirtualDeviceParams implements Parcelable { * @see android.hardware.display.DisplayManager#VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR * @see #setScreenOffTimeout */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + @FlaggedApi(Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) @NonNull public Builder setDimDuration(@NonNull Duration dimDuration) { if (Objects.requireNonNull(dimDuration).compareTo(Duration.ZERO) < 0) { @@ -901,7 +899,7 @@ public final class VirtualDeviceParams implements Parcelable { * @see #setDimDuration * @see VirtualDeviceManager.VirtualDevice#goToSleep() */ - @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + @FlaggedApi(Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) @NonNull public Builder setScreenOffTimeout(@NonNull Duration screenOffTimeout) { if (Objects.requireNonNull(screenOffTimeout).compareTo(Duration.ZERO) < 0) { @@ -1311,15 +1309,11 @@ public final class VirtualDeviceParams implements Parcelable { mScreenOffTimeout = INFINITE_TIMEOUT; } - if (!Flags.virtualCamera()) { - mDevicePolicies.delete(POLICY_TYPE_CAMERA); - } - - if (!android.companion.virtualdevice.flags.Flags.defaultDeviceCameraAccessPolicy()) { + if (!Flags.defaultDeviceCameraAccessPolicy()) { mDevicePolicies.delete(POLICY_TYPE_DEFAULT_DEVICE_CAMERA_ACCESS); } - if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (!Flags.activityControlApi()) { mDevicePolicies.delete(POLICY_TYPE_BLOCKED_ACTIVITY); } diff --git a/core/java/android/companion/virtual/camera/VirtualCamera.java b/core/java/android/companion/virtual/camera/VirtualCamera.java index ece048d3a95b..b7bcc29a39cb 100644 --- a/core/java/android/companion/virtual/camera/VirtualCamera.java +++ b/core/java/android/companion/virtual/camera/VirtualCamera.java @@ -16,14 +16,12 @@ package android.companion.virtual.camera; -import android.annotation.FlaggedApi; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.TestApi; import android.companion.virtual.IVirtualDevice; import android.companion.virtual.VirtualDeviceManager; import android.companion.virtual.VirtualDeviceParams; -import android.companion.virtual.flags.Flags; import android.hardware.camera2.CameraDevice; import android.os.RemoteException; @@ -51,7 +49,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA) public final class VirtualCamera implements Closeable { private final IVirtualDevice mVirtualDevice; diff --git a/core/java/android/companion/virtual/camera/VirtualCameraCallback.java b/core/java/android/companion/virtual/camera/VirtualCameraCallback.java index c894de428b10..d326be83c404 100644 --- a/core/java/android/companion/virtual/camera/VirtualCameraCallback.java +++ b/core/java/android/companion/virtual/camera/VirtualCameraCallback.java @@ -16,11 +16,9 @@ package android.companion.virtual.camera; -import android.annotation.FlaggedApi; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.companion.virtual.flags.Flags; import android.graphics.ImageFormat; import android.view.Surface; @@ -34,7 +32,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA) public interface VirtualCameraCallback { /** diff --git a/core/java/android/companion/virtual/camera/VirtualCameraConfig.java b/core/java/android/companion/virtual/camera/VirtualCameraConfig.java index 769b658c78ce..6c88ec99349e 100644 --- a/core/java/android/companion/virtual/camera/VirtualCameraConfig.java +++ b/core/java/android/companion/virtual/camera/VirtualCameraConfig.java @@ -18,14 +18,12 @@ package android.companion.virtual.camera; import static java.util.Objects.requireNonNull; -import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.companion.virtual.VirtualDevice; -import android.companion.virtual.flags.Flags; import android.graphics.ImageFormat; import android.graphics.PixelFormat; import android.hardware.camera2.CameraMetadata; @@ -47,7 +45,6 @@ import java.util.concurrent.Executor; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA) public final class VirtualCameraConfig implements Parcelable { private static final int LENS_FACING_UNKNOWN = -1; @@ -198,7 +195,6 @@ public final class VirtualCameraConfig implements Parcelable { * VirtualCameraCallback)} * <li>A lens facing must be set with {@link #setLensFacing(int)} */ - @FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA) public static final class Builder { private final String mName; diff --git a/core/java/android/companion/virtual/camera/VirtualCameraStreamConfig.java b/core/java/android/companion/virtual/camera/VirtualCameraStreamConfig.java index 6ab66b3d2309..be498806697c 100644 --- a/core/java/android/companion/virtual/camera/VirtualCameraStreamConfig.java +++ b/core/java/android/companion/virtual/camera/VirtualCameraStreamConfig.java @@ -16,11 +16,9 @@ package android.companion.virtual.camera; -import android.annotation.FlaggedApi; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemApi; -import android.companion.virtual.flags.Flags; import android.graphics.ImageFormat; import android.os.Parcel; import android.os.Parcelable; @@ -35,7 +33,6 @@ import java.util.Objects; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_VIRTUAL_CAMERA) public final class VirtualCameraStreamConfig implements Parcelable { // TODO(b/310857519): Check if we should increase the fps upper limit in future. static final int MAX_FPS_UPPER_LIMIT = 60; diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig index 1cf42820f356..5b688e5239b0 100644 --- a/core/java/android/companion/virtual/flags/flags.aconfig +++ b/core/java/android/companion/virtual/flags/flags.aconfig @@ -11,13 +11,6 @@ package: "android.companion.virtualdevice.flags" container: "system" flag { - namespace: "virtual_devices" - name: "virtual_camera_service_discovery" - description: "Enable discovery of the Virtual Camera HAL without a VINTF entry" - bug: "305170199" -} - -flag { namespace: "virtual_devices" name: "virtual_display_insets" description: "APIs for specifying virtual display insets (via cutout)" @@ -34,13 +27,6 @@ flag { } flag { - namespace: "virtual_devices" - name: "camera_device_awareness" - description: "Enable device awareness in camera service" - bug: "305170199" -} - -flag { name: "virtual_rotary" is_exported: true namespace: "virtual_devices" diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index ca3e3d2ad61b..6ec70045f1f4 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -358,8 +358,7 @@ public class Camera { CameraInfo cameraInfo); private static int getDevicePolicyFromContext(Context context) { - if (context.getDeviceId() == DEVICE_ID_DEFAULT - || !android.companion.virtual.flags.Flags.virtualCamera()) { + if (context.getDeviceId() == DEVICE_ID_DEFAULT) { return DEVICE_POLICY_DEFAULT; } diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index bfaff941939c..507f8f4fecad 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -591,8 +591,7 @@ public final class CameraManager { /** @hide */ public int getDevicePolicyFromContext(@NonNull Context context) { - if (context.getDeviceId() == DEVICE_ID_DEFAULT - || !android.companion.virtual.flags.Flags.virtualCamera()) { + if (context.getDeviceId() == DEVICE_ID_DEFAULT) { return DEVICE_POLICY_DEFAULT; } @@ -2576,11 +2575,6 @@ public final class CameraManager { private boolean shouldHideCamera(int currentDeviceId, int devicePolicy, DeviceCameraInfo info) { - if (!android.companion.virtualdevice.flags.Flags.cameraDeviceAwareness()) { - // Don't hide any cameras if the device-awareness feature flag is disabled. - return false; - } - if (devicePolicy == DEVICE_POLICY_DEFAULT && info.mDeviceId == DEVICE_ID_DEFAULT) { // Don't hide default-device cameras for a default-policy virtual device. return false; diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index c385fbad02a5..b75728e9f97c 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -30,7 +30,6 @@ 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.companion.virtualdevice.flags.Flags.virtualCameraServiceDiscovery; import android.annotation.NonNull; import android.annotation.Nullable; @@ -55,9 +54,9 @@ import android.companion.virtual.VirtualDeviceParams; import android.companion.virtual.audio.IAudioConfigChangedCallback; import android.companion.virtual.audio.IAudioRoutingCallback; import android.companion.virtual.camera.VirtualCameraConfig; -import android.companion.virtual.flags.Flags; import android.companion.virtual.sensor.VirtualSensor; import android.companion.virtual.sensor.VirtualSensorEvent; +import android.companion.virtualdevice.flags.Flags; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledAfter; import android.content.AttributionSource; @@ -265,7 +264,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub UserHandle.SYSTEM); } - if (android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (Flags.activityControlApi()) { try { mActivityListener.onActivityLaunchBlocked( displayId, @@ -280,7 +279,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @Override public void onSecureWindowShown(int displayId, @NonNull ActivityInfo activityInfo) { - if (android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (Flags.activityControlApi()) { try { mActivityListener.onSecureWindowShown( displayId, @@ -318,7 +317,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @Override public void onSecureWindowHidden(int displayId) { - if (android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (Flags.activityControlApi()) { try { mActivityListener.onSecureWindowHidden(displayId); } catch (RemoteException e) { @@ -682,7 +681,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub checkCallerIsDeviceOwner(); final int displayId = exemption.getDisplayId(); if (exemption.getComponentName() == null || displayId != Display.INVALID_DISPLAY) { - if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (!Flags.activityControlApi()) { return; } } @@ -719,7 +718,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub checkCallerIsDeviceOwner(); final int displayId = exemption.getDisplayId(); if (exemption.getComponentName() == null || displayId != Display.INVALID_DISPLAY) { - if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (!Flags.activityControlApi()) { return; } } @@ -921,7 +920,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub } break; case POLICY_TYPE_BLOCKED_ACTIVITY: - if (android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (Flags.activityControlApi()) { synchronized (mVirtualDeviceLock) { mDevicePolicies.put(policyType, devicePolicy); } @@ -938,7 +937,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub @VirtualDeviceParams.DynamicDisplayPolicyType int policyType, @VirtualDeviceParams.DevicePolicy int devicePolicy) { checkCallerIsDeviceOwner(); - if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (!Flags.activityControlApi()) { return; } synchronized (mVirtualDeviceLock) { @@ -1508,7 +1507,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub } private PowerManager.WakeLock createAndAcquireWakeLockForDisplay(int displayId) { - if (android.companion.virtualdevice.flags.Flags.deviceAwareDisplayPower()) { + if (Flags.deviceAwareDisplayPower()) { return null; } final long token = Binder.clearCallingIdentity(); @@ -1531,7 +1530,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub // infinite blocking loop. return false; } - if (!android.companion.virtualdevice.flags.Flags.activityControlApi()) { + if (!Flags.activityControlApi()) { return true; } // Do not show the dialog if disabled by policy. @@ -1868,8 +1867,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub } private static boolean isVirtualCameraEnabled() { - return Flags.virtualCamera() && virtualCameraServiceDiscovery() - && nativeVirtualCameraServiceBuildFlagEnabled(); + return nativeVirtualCameraServiceBuildFlagEnabled(); } // Returns true if virtual_camera service is enabled in this build. |