Snap for 12477291 from 23cee311f9 to 25Q1-release

Change-Id: I16202fbc4e8cfc1f4fd0f8c9e88facddb6f3aaf4
This commit is contained in:
Android Build Coastguard Worker 2024-10-09 21:03:59 +00:00
commit c0410c3725

View file

@ -1090,6 +1090,7 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
pthread_mutex_lock(&usb->mLock); pthread_mutex_lock(&usb->mLock);
status = getPortStatusHelper(usb, currentPortStatus); status = getPortStatusHelper(usb, currentPortStatus);
if (status == Status::SUCCESS && currentPortStatus->size() > 0) {
queryMoistureDetectionStatus(currentPortStatus); queryMoistureDetectionStatus(currentPortStatus);
queryPowerTransferStatus(currentPortStatus); queryPowerTransferStatus(currentPortStatus);
queryNonCompliantChargerStatus(currentPortStatus); queryNonCompliantChargerStatus(currentPortStatus);
@ -1111,6 +1112,9 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
} else { } else {
ALOGI("Notifying userspace skipped. Callback is NULL"); ALOGI("Notifying userspace skipped. Callback is NULL");
} }
} else {
ALOGI("%s skipped. currentPortStatus is empty", __func__);
}
pthread_mutex_unlock(&usb->mLock); pthread_mutex_unlock(&usb->mLock);
} }