Evolution-X-Tensor/device_google_zumapro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Usb: Add status check to prevent NPE" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-10-09 09:43:42 +00:00 • committed by Android (Google) Code Review
commit 348defd241
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
usb/usb/Usb.cpp
View file

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