Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9ff3f01 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Remove stream_camera VDM flag" into android15-tests-dev am: f748c172" into main am: 58cebdb8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3342523



Change-Id: I06745e2d64ad9b057397568806d5db62c7501fee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7915b27a 58cebdb8

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

+0 −7
Original line number Diff line number Diff line
@@ -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"

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

+0 −3
Original line number Diff line number Diff line
@@ -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++) {