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

Commit e8650320 authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

Fix bug in GnssLocationProvider. 

Perform nullptr checking correctly before calling setCallback()
on gnssXtraIface.

Bug: 33334137
Test: Checked no crash happens when GNSS HAL returns a null
GnssXtraInfc.

Change-Id: I763d96443a0a6c0f036ecfc86ac442b297560efa
parent 4b3d0ce2

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1009,13 +1009,13 @@ static jboolean android_location_GnssLocationProvider_init(JNIEnv* env, jobject 
    sp<IGnssXtraCallback> gnssXtraCbIface = new GnssXtraCallback();

    if (gnssXtraIface == nullptr) {

        ALOGE("Unable to initialize GNSS Xtra interface\n");

    }



    } else {

        result = gnssXtraIface->setCallback(gnssXtraCbIface);

        if ((!result) || (!result.getStatus().isOk())) {

            gnssXtraIface = nullptr;

            ALOGE("SetCallback for Gnss Xtra Interface fails\n");

        }

    }



    sp<IAGnssCallback> aGnssCbIface = new AGnssCallback();

    if (agnssIface != nullptr) {