Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I8e4fe40207cbb896019ff8e145b407034abf318c
Change-Id: I039589c77baaa50087b1c92dcbe94a87affae6f5
This commit is contained in:
Xin Li
2022-06-14 16:39:59 -07:00
2 changed files with 8 additions and 1 deletions

View File

@@ -231,7 +231,9 @@
<!-- Height of the status bar.
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-->
<dimen name="status_bar_height">28dp</dimen>
<dimen name="status_bar_height_default">28dp</dimen>
<dimen name="status_bar_height_portrait">145px</dimen>
<dimen name="status_bar_height_landscape">28dp</dimen>
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,

View File

@@ -137,6 +137,11 @@ OFFHOST_ROUTE_ESE={86}
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
DEFAULT_ISODEP_ROUTE=0x81
###############################################################################
# Configure the ACTIVE_RW timer
# Default 0x00, set 0x01 to enable it
STNFC_ACTIVERW_TIMER=0x01
###############################################################################
# Core configuration settings
CORE_CONF_PROP={ 20, 02, 0a, 03,