Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc058cc authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Update getInterfaceVersion checks to include -1 

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
parent 3430e758

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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();

        }