commit 58cebdb80ea4e48ea4b0c1e376b88f2a11ba3372
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 11 18:29:45 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 11 18:29:45 2024 +0000
tree 960dd5df82363dd044f7c2cafb6ab32fb6eaf9b3
parent 111967e5c1d1f45a47f0cc5aa1d875ce2fd23621
parent 4952179495f9c0a64d060a9f8dc273ce2267d1fc

Merge "Merge "Remove stream_camera VDM flag" into android15-tests-dev am: f748c17283" into main

core/java/android/companion/virtual/flags.aconfig

diff --git a/core/java/android/companion/virtual/flags.aconfig b/core/java/android/companion/virtual/flags.aconfig
index b29b52d..f01d8e0 100644
--- a/core/java/android/companion/virtual/flags.aconfig
+++ b/core/java/android/companion/virtual/flags.aconfig
@@ -74,13 +74,6 @@
 }
 
 flag {
-  name: "stream_camera"
-  namespace: "virtual_devices"
-  description: "Enable streaming camera to Virtual Devices"
-  bug: "291740640"
-}
-
-flag {
   name: "stream_permissions"
   namespace: "virtual_devices"
   description: "Enable streaming permission dialogs to Virtual Devices"

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

diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java
index 9ad73ca..b2e2cfa 100644
--- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java
@@ -211,9 +211,6 @@
     }
 
     CameraAccessController getCameraAccessController(UserHandle userHandle) {
-        if (Flags.streamCamera()) {
-            return null;
-        }
         int userId = userHandle.getIdentifier();
         synchronized (mVirtualDeviceManagerLock) {
             for (int i = 0; i < mVirtualDevices.size(); i++) {