commit 1d32d9af199e8d713813d9a3402d587f3601a233
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 11 18:12:35 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 11 18:12:35 2023 +0000
tree e8aed12e6d2cf5bd8e251e98c5a07d39c1e52986
parent f21942129a38d0cbb59a1a710a943a3eee239e9f
parent 9e505e2ee77e336d2c7299a6dd593e207b409877

Merge "Allow camera service to access "ro.camera.disableJpegR" property" into udc-dev

prebuilts/api/34.0/private/property_contexts

diff --git a/prebuilts/api/34.0/private/property_contexts b/prebuilts/api/34.0/private/property_contexts
index c116d4b..902e8e7 100644
--- a/prebuilts/api/34.0/private/property_contexts
+++ b/prebuilts/api/34.0/private/property_contexts
@@ -406,6 +406,8 @@
 ro.camera.notify_nfc          u:object_r:camera_config_prop:s0 exact bool
 ro.camera.enableLazyHal       u:object_r:camera_config_prop:s0 exact bool
 ro.camera.enableCamera1MaxZsl u:object_r:camera_config_prop:s0 exact bool
+ro.camera.disableJpegR        u:object_r:camera_config_prop:s0 exact bool
+ro.camera.enableCompositeAPI0JpegR u:object_r:camera_config_prop:s0 exact bool
 
 ro.camerax.extensions.enabled u:object_r:camerax_extensions_prop:s0 exact bool
 

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index c116d4b..902e8e7 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -406,6 +406,8 @@
 ro.camera.notify_nfc          u:object_r:camera_config_prop:s0 exact bool
 ro.camera.enableLazyHal       u:object_r:camera_config_prop:s0 exact bool
 ro.camera.enableCamera1MaxZsl u:object_r:camera_config_prop:s0 exact bool
+ro.camera.disableJpegR        u:object_r:camera_config_prop:s0 exact bool
+ro.camera.enableCompositeAPI0JpegR u:object_r:camera_config_prop:s0 exact bool
 
 ro.camerax.extensions.enabled u:object_r:camerax_extensions_prop:s0 exact bool