commit 5467fac0814eb7b6963845fb95acf883deed51cb
author Roger Liao <rogerliao@google.com> Wed Dec 29 19:06:09 2021 +0800
committer Roger Liao <rogerliao@google.com> Thu Dec 30 07:34:03 2021 +0000
tree 8b1aaabb2a9e85a3d62ccf7f471a3637e2c2d483
parent 3406cfb76e21bfc6356b0a298ebfe44d35f6065b

Scale the flexibility for camera flash/autofocus settings

Let clients determine the configuration of camera flash/autofocus
features.

Bug: b/211840489
Change-Id: Id52529ea8985c02a8a93ebea0dbd2f619cf0cca9

device.mk

diff --git a/device.mk b/device.mk
index dc47041..f3dddbb 100644
--- a/device.mk
+++ b/device.mk
@@ -571,8 +571,13 @@
 	frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
 	frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml
 
+# (See b/211840489)
+ifneq ($(DISABLE_CAMERA_FS_AF),true)
 PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \
+	frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml
+endif
+
+PRODUCT_COPY_FILES += \
 	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.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \
 	frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\