[automerger skipped] Merge TQ2A.230405.003 am: 53f33ec955 am: 138362d9c8 -s ours
am skip reason: Merged-In Ie698acacc96e7913d3b09523a558bc7d06d7277e with SHA-1 b1ed6bbd30 is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2530521
Change-Id: Idc8c9989711079abdbb73718fbb9b6a13d7d9bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index c8b1eea..3baaaf9 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=50
+ ro.vendor.build.svn=56
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 72c6899..2b6cf90 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -180,7 +180,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=50
+ ro.vendor.build.svn=56
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 06710b2..51afbd9 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -327,4 +327,10 @@
Note: This should be only enabled on devices with high confidence on power measurement.
-->
<bool name="config_bg_current_drain_auto_restrict_abusive_apps">true</bool>
+
+ <!-- The list of packages to force slowJpegMode for Apps using Camera API1 -->
+ <string-array name="config_forceSlowJpegModeList" translatable="false">
+ <item>com.facebook.orca</item>
+ <item>com.skype.raider</item>
+ </string-array>
</resources>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 81e51c4..57b661d 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -303,4 +303,10 @@
Note: This should be only enabled on devices with high confidence on power measurement.
-->
<bool name="config_bg_current_drain_auto_restrict_abusive_apps">true</bool>
+
+ <!-- The list of packages to force slowJpegMode for Apps using Camera API1 -->
+ <string-array name="config_forceSlowJpegModeList" translatable="false">
+ <item>com.facebook.orca</item>
+ <item>com.skype.raider</item>
+ </string-array>
</resources>