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

Commit e5610fa7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix null access on mBluetoothA2dp" into main am: 7455677a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2817738



Change-Id: I97001a2a304903e9d72f997d5d332d951fa8dcad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97bb004d 7455677a

media/libaudiohal/impl/DeviceHalAidl.cpp

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

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

        keys.remove(key);

        if (mBluetoothA2dp != nullptr) {

            bool supports;

            RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

                            mBluetoothA2dp->supportsOffloadReconfiguration(&supports)));

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

        } else {

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

            result->addInt(key, 0);

        }

    }

    return OK;

}