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

Commit 7455677a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "fix null access on mBluetoothA2dp" into main

parents 30586367 a7761edc

media/libaudiohal/impl/DeviceHalAidl.cpp

+9 −4
Original line number Original line Diff line number Diff line
@@ -1221,10 +1221,15 @@ status_t DeviceHalAidl::filterAndRetrieveBtA2dpParameters( 
    TIME_CHECK();

    TIME_CHECK();

    if (String8 key = String8(AudioParameter::keyReconfigA2dpSupported); keys.containsKey(key)) {

    if (String8 key = String8(AudioParameter::keyReconfigA2dpSupported); keys.containsKey(key)) {

        keys.remove(key);

        keys.remove(key);

        if (mBluetoothA2dp != nullptr) {

            bool supports;

            bool supports;

            RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

                            mBluetoothA2dp->supportsOffloadReconfiguration(&supports)));

                            mBluetoothA2dp->supportsOffloadReconfiguration(&supports)));

            result->addInt(key, supports ? 1 : 0);

            result->addInt(key, supports ? 1 : 0);

        } else {

            ALOGI("%s: no IBluetoothA2dp on %s", __func__, mInstance.c_str());

            result->addInt(key, 0);

        }

    }

    }

    return OK;

    return OK;

}

}