Snap for 12477291 from f22f21191b
to 25Q1-release
Change-Id: I75e6dd47949bac08f90bee9bccb3ce87f98752f2
This commit is contained in:
commit
1e5163043c
1 changed files with 14 additions and 10 deletions
|
@ -990,17 +990,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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue