Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update getInterfaceVersion checks to include -1

Browse Source 
getInterfaceVersion() returns -1 if it is unknown.

V1 of the HAL doesn't implement getInterfaceVersion
due to ABI reasons for regular, unversioned, AIDL
interfaces.

Bug: 206670536
Test: on device
Change-Id: I358fe2748b4a8450b68d0954dee0814fe246eb18
This commit is contained in:
Yu-Han Yang
2022-02-02 16:28:58 -08:00
parent 3430e75818
commit ffc058ccea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/jni/com_android_server_location_GnssLocationProvider.cpp
View File

@@ -509,7 +509,7 @@ uint32_t GnssCallback::getConstellationType(
template <class T_list, class T_sv_info>
Return<void> GnssCallback::gnssSvStatusCbImpl(const T_list& svStatus) {
// In HIDL or AIDL v1, if no listener is registered, do not report svInfoList to the framework.
if (gnssHalAidl == nullptr || gnssHalAidl->getInterfaceVersion() == 1) {
if (gnssHalAidl == nullptr || gnssHalAidl->getInterfaceVersion() <= 1) {
if (!isSvStatusRegistered) {
return Void();
}
@@ -695,7 +695,7 @@ Status GnssCallbackAidl::gnssLocationCb(const GnssLocationAidl& location) {
Status GnssCallbackAidl::gnssNmeaCb(const int64_t timestamp, const std::string& nmea) {
// In AIDL v1, if no listener is registered, do not report nmea to the framework.
if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() == 1) {
if (gnssHalAidl != nullptr && gnssHalAidl->getInterfaceVersion() <= 1) {
if (!isNmeaRegistered) {
return Status::ok();
}