Merge Android 12L
Bug: 222710654
Merged-In: I8773e334a1f8d9d5b50b089af00431f6c7d26432
Change-Id: I7e38c930bf432a658e4dee79d5b6a9f8156d1ade
diff --git a/barbet/overlay/frameworks/base/core/res/res/values/config.xml b/barbet/overlay/frameworks/base/core/res/res/values/config.xml
index 16434d5..0605b17 100755
--- a/barbet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/barbet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -209,9 +209,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 0.0,0.0
- h 136
+ h 145
v 136
- h -136
+ h -145
Z
@left
</string>
@@ -225,12 +225,10 @@
rounded_corner_radius to more accurately provide a "radius" for the rounded corners.-->
<dimen name="rounded_corner_radius_adjustment">16px</dimen>
- <!-- Height of the status bar in portrait. The height should be
- Max((status bar content height + waterfall top size), top cutout size) -->
- <dimen name="status_bar_height_portrait">145px</dimen>
- <dimen name="status_bar_height_landscape">28dp</dimen>
- <!-- Height of area above QQS where battery/time go (equal to status bar) -->
- <dimen name="quick_qs_offset_height">145px</dimen>
+ <!-- Height of the status bar.
+ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+ -->
+ <dimen name="status_bar_height">28dp</dimen>
<!-- Whether the device enable the standalone (SA) mode of 5G NR.-->
<bool name="config_telephony5gStandalone">true</bool>
@@ -248,4 +246,6 @@
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
</string-array>
+ <!-- the number of the max cached processes in the system. -->
+ <integer name="config_customizedMaxCachedProcesses">64</integer>
</resources>
diff --git a/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 75d0eaa..45e756e 100644
--- a/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/barbet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -41,8 +41,8 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
- <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
- <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
to brightness values; -1 means keeping the current brightness. -->
diff --git a/default-permissions.xml b/default-permissions.xml
index 1b1b3f2..8324453 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -79,6 +79,7 @@
<exception package="com.google.android.apps.cbrsnetworkmonitor">
<!-- Location access to create CBRS geofences-->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true"/>
+ <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="true"/>
<permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="true"/>
</exception>
diff --git a/device-barbet.mk b/device-barbet.mk
index 9df346d..941bd0f 100644
--- a/device-barbet.mk
+++ b/device-barbet.mk
@@ -39,7 +39,7 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=17
+ ro.vendor.build.svn=18
# Enable watchdog timeout loop breaker.
PRODUCT_PROPERTY_OVERRIDES += \
@@ -203,7 +203,3 @@
PRODUCT_COPY_FILES += \
device/google/barbet/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml
-
-# (b/183612348): Enable skia reduceOpsTaskSplitting
-PRODUCT_PROPERTY_OVERRIDES += \
- renderthread.skia.reduceopstasksplitting=true
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index c15b831..673a269 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -14,6 +14,8 @@
system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml \
system_ext/etc/permissions/org_codeaurora_ims.xml \
system_ext/etc/permissions/qcrilhook.xml \
+ system_ext/etc/permissions/qti_telephony_hidl_wrapper.xml \
+ system_ext/etc/permissions/qti_telephony_utils.xml \
system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar \
system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar \
system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 9d55e56..3b6d681 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -42,6 +42,8 @@
vendor/qcom/barbet/proprietary/com.qualcomm.qti.imscmservice-V2.2-java.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml \
vendor/qcom/barbet/proprietary/org_codeaurora_ims.xml:system_ext/etc/permissions/org_codeaurora_ims.xml \
vendor/qcom/barbet/proprietary/qcrilhook.xml:system_ext/etc/permissions/qcrilhook.xml \
+ vendor/qcom/barbet/proprietary/qti_telephony_hidl_wrapper.xml:system_ext/etc/permissions/qti_telephony_hidl_wrapper.xml \
+ vendor/qcom/barbet/proprietary/qti_telephony_utils.xml:system_ext/etc/permissions/qti_telephony_utils.xml \
vendor/qcom/barbet/proprietary/com.qualcomm.qti.imscmservice-V2.0-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar \
vendor/qcom/barbet/proprietary/com.qualcomm.qti.imscmservice-V2.1-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar \
vendor/qcom/barbet/proprietary/com.qualcomm.qti.imscmservice-V2.2-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar \
