Evolution-X-Devices/device_google_bramble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Android 14 QPR3 to AOSP main

Browse Source 
Bug: 346855327
Merged-In: If01754baa46498974229c335d8841c686c0d9638
Change-Id: Icd031a9c846e4625f33b2e56212841b1b2b901bb
This commit is contained in:
Xin Li
2024-06-13 10:48:13 -07:00
parent 752dcbe718 c01b81ea87
commit 7392468ace
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bramble/rro_overlays/NfcOverlay/res/values/config.xml
View File

@@ -35,4 +35,5 @@
<integer-array name="antenna_y">
<item>87</item>
</integer-array>
<bool name="nfc_observe_mode_supported">true</bool>
</resources>

2
usb/usb/Usb.cpp
View File

@@ -93,7 +93,7 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
}
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;
}
}