Snap for 12477291 from 7ed8a55835 to 25Q1-release

Change-Id: Ie5374bb870801242e06d6458fdf870d9a09692ed
This commit is contained in:
Android Build Coastguard Worker 2024-10-09 21:02:46 +00:00
commit c846b82faf

View file

@ -943,17 +943,21 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
Status status; Status status;
pthread_mutex_lock(&usb->mLock); pthread_mutex_lock(&usb->mLock);
status = getPortStatusHelper(usb, currentPortStatus); status = getPortStatusHelper(usb, currentPortStatus);
queryMoistureDetectionStatus(usb, currentPortStatus); if (status == Status::SUCCESS && currentPortStatus->size() > 0) {
queryPowerTransferStatus(usb, currentPortStatus); queryMoistureDetectionStatus(usb, currentPortStatus);
queryNonCompliantChargerStatus(currentPortStatus); queryPowerTransferStatus(usb, currentPortStatus);
queryUsbDataSession(usb, currentPortStatus); queryNonCompliantChargerStatus(currentPortStatus);
if (usb->mCallback != NULL) { queryUsbDataSession(usb, currentPortStatus);
ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus, if (usb->mCallback != NULL) {
status); ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
if (!ret.isOk()) status);
ALOGE("queryPortStatus error %s", ret.getDescription().c_str()); if (!ret.isOk())
ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
} else {
ALOGI("Notifying userspace skipped. Callback is NULL");
}
} else { } else {
ALOGI("Notifying userspace skipped. Callback is NULL"); ALOGI("%s skipped. currentPortStatus is empty", __func__);
} }
pthread_mutex_unlock(&usb->mLock); pthread_mutex_unlock(&usb->mLock);
} }