From 216c82ec61c22b67cf50528207f0f693833bf220 Mon Sep 17 00:00:00 2001 From: Biswarup Pal Date: Fri, 8 Nov 2024 22:07:15 +0000 Subject: Remove stream_camera VDM flag Test: atest CtsVirtualDevicesAppLaunchTestCases Bug: 375970158 Flag: EXEMPT flag cleanup Merged-In: Iedf68beb2a9f3003f675e125605facf8837dcb1b Change-Id: I7a158eef3322934ab9d2951fd8b8ecd3de1c23c7 --- core/java/android/companion/virtual/flags.aconfig | 7 ------- .../server/companion/virtual/VirtualDeviceManagerService.java | 3 --- 2 files changed, 10 deletions(-) diff --git a/core/java/android/companion/virtual/flags.aconfig b/core/java/android/companion/virtual/flags.aconfig index b29b52d67310..f01d8e0ee576 100644 --- a/core/java/android/companion/virtual/flags.aconfig +++ b/core/java/android/companion/virtual/flags.aconfig @@ -73,13 +73,6 @@ flag { bug: "270352264" } -flag { - name: "stream_camera" - namespace: "virtual_devices" - description: "Enable streaming camera to Virtual Devices" - bug: "291740640" -} - flag { name: "stream_permissions" namespace: "virtual_devices" 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 9ad73cae08cd..b2e2cfa6bd43 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 @@ public class VirtualDeviceManagerService extends SystemService { } CameraAccessController getCameraAccessController(UserHandle userHandle) { - if (Flags.streamCamera()) { - return null; - } int userId = userHandle.getIdentifier(); synchronized (mVirtualDeviceManagerLock) { for (int i = 0; i < mVirtualDevices.size(); i++) { -- cgit v1.2.3-59-g8ed1b