commit 6e548e33870d5cef80957266743e2c5e094190d5
author Jayant Chowdhary <jchowdhary@google.com> Tue May 05 15:55:40 2020 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Tue May 05 15:55:44 2020 -0700
tree e760d7a06a2c8246bb5d09879961f86e4232c928
parent bff0190ccd37caf6bc1543176609a4cd9ad13a21

Add FEATURE_CAMERA_CONCURRENT to cuttlefish.

Bug: 155188113

Test: atest CameraManagerTest.java

Change-Id: Ic5e262f6686f9767fba6e236e080547a53b2c4dc
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 870ec91..66dea8d 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -186,6 +186,7 @@
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
     frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
+    frameworks/native/data/etc/android.hardware.camera.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
     frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
     frameworks/native/data/etc/android.hardware.reboot_escrow.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.reboot_escrow.xml \