Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550 Merged-In: I0b45c28183e3ba3225eb925cf3fd2110a14c1b2b Change-Id: I0065ebafcd8db6d9348f51da75f30fab720968f5
This commit is contained in:
@@ -35,4 +35,5 @@
|
||||
<integer-array name="antenna_y">
|
||||
<item>74</item>
|
||||
</integer-array>
|
||||
<bool name="nfc_observe_mode_supported">true</bool>
|
||||
</resources>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user