commit f748c17283ace9badcb93aa40eade6afbe2c3e84
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 11 18:04:54 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 11 18:04:54 2024 +0000
tree dac4264db8762a9b77ee3941a996e373cbd3382c
parent ef5149b0bdde8d45cac311ceceb2fa898a56a6d3
parent 216c82ec61c22b67cf50528207f0f693833bf220

Merge "Remove stream_camera VDM flag" into android15-tests-dev

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++) {