summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/companion/virtual/flags.aconfig7
-rw-r--r--services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java3
2 files changed, 0 insertions, 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
@@ -74,13 +74,6 @@ flag {
}
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"
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++) {