diff options
| author | Xin Li <delphij@google.com> | 2022-04-01 20:32:11 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-04-01 20:32:11 +0000 |
| commit | 7cab3dd12d4fc4f0deaa3cd4f65ec53b4cbf6a51 (patch) | |
| tree | d18c70827deccd54bc012d513f1da49633e8a406 | |
| parent | 46637c199b0a68f8959d7366cf829d2455012b5d (diff) | |
| parent | 3f3f3338affdb3eb00e469d0479d00f4dbd4e326 (diff) | |
| download | bramble-7cab3dd12d4fc4f0deaa3cd4f65ec53b4cbf6a51.tar.gz | |
Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Id622927dc17f40536c60ce9f61ef11531303babc
Change-Id: I0d217347e8013148878078b33e000c81d47b5897
| -rw-r--r-- | nfc/libnfc-hal-st-G6QU3.conf | 5 | ||||
| -rw-r--r-- | self-extractors/qcom/staging/Android.mk | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nfc/libnfc-hal-st-G6QU3.conf b/nfc/libnfc-hal-st-G6QU3.conf index 3b125b5..1f126b9 100644 --- a/nfc/libnfc-hal-st-G6QU3.conf +++ b/nfc/libnfc-hal-st-G6QU3.conf @@ -138,6 +138,11 @@ OFFHOST_ROUTE_ESE={86} 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, a1, 01, 1e, diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk index d09d12e..8af890f 100644 --- a/self-extractors/qcom/staging/Android.mk +++ b/self-extractors/qcom/staging/Android.mk @@ -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) |