Merge Android 12 QPR3 ab/8391262

Bug: 226662282
Merged-In: Id622927dc17f40536c60ce9f61ef11531303babc
Change-Id: I0d217347e8013148878078b33e000c81d47b5897
This commit is contained in:
Xin Li
2022-04-01 20:32:11 +00:00
2 changed files with 9 additions and 0 deletions

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,

View File

@@ -1,5 +1,9 @@
LOCAL_PATH := $(call my-dir)
$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bramble,:qcom,legacy_proprietary,proprietary,vendor/qcom/bramble/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bramble,.jar,legacy_proprietary,proprietary,vendor/qcom/bramble/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bramble,.xml,legacy_proprietary,proprietary,vendor/qcom/bramble/LICENSE,))
ifneq ($(filter bramble, $(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)