| commit | 7392468ace6535ee9f686a84f05e4e5052997349 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Jun 13 10:48:13 2024 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Jun 13 10:48:13 2024 -0700 |
| tree | fa2920f8762dfbea05324ac38a2541a6f3e1cdd8 | |
| parent | 752dcbe718822d5def662d54ab3d15d21f2ec1a4 [diff] | |
| parent | c01b81ea8732d4adcb30f294312df80a0cfb1ed7 [diff] |
Merge Android 14 QPR3 to AOSP main Bug: 346855327 Merged-In: If01754baa46498974229c335d8841c686c0d9638 Change-Id: Icd031a9c846e4625f33b2e56212841b1b2b901bb
diff --git a/bramble/rro_overlays/NfcOverlay/res/values/config.xml b/bramble/rro_overlays/NfcOverlay/res/values/config.xml index fe16e58..50aa543 100644 --- a/bramble/rro_overlays/NfcOverlay/res/values/config.xml +++ b/bramble/rro_overlays/NfcOverlay/res/values/config.xml
@@ -35,4 +35,5 @@ <integer-array name="antenna_y"> <item>87</item> </integer-array> + <bool name="nfc_observe_mode_supported">true</bool> </resources>
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index ed358cd..7abf239 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp
@@ -93,7 +93,7 @@ } if (!WriteStringToFile("0", USB_DATA_PATH)) { - ALOGE("Not able to turn on usb connection notification"); + ALOGE("Not able to turn off usb connection notification"); result = false; } }