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

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

Merge "AudioPolicy: Replace ALOG with nullptr check before adding values to... 

Merge "AudioPolicy: Replace ALOG with nullptr check before adding values to vector" into main am: 12412d2c am: 2252eb4e

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



Change-Id: I623b0b8e81cf89161520330d76b787ebf6072f3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4960a3a0 2252eb4e

services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp

+5 −3
Original line number Original line Diff line number Diff line
@@ -225,8 +225,7 @@ void DeviceVector::add(const DeviceVector &devices) 
{

{

    bool added = false;

    bool added = false;

    for (const auto& device : devices) {

    for (const auto& device : devices) {

        ALOG_ASSERT(device != nullptr, "Null pointer found when adding DeviceVector");

        if (device && indexOf(device) < 0 && SortedVector::add(device) >= 0) {

        if (indexOf(device) < 0 && SortedVector::add(device) >= 0) {

            added = true;

            added = true;

        }

        }

    }

    }
@@ -238,7 +237,10 @@ void DeviceVector::add(const DeviceVector &devices) 




ssize_t DeviceVector::add(const sp<DeviceDescriptor>& item)

ssize_t DeviceVector::add(const sp<DeviceDescriptor>& item)

{

{

    ALOG_ASSERT(item != nullptr, "Adding null pointer to DeviceVector");

    if (!item) {

        ALOGW("DeviceVector::%s() null device", __func__);

        return -1;

    }

    ssize_t ret = indexOf(item);

    ssize_t ret = indexOf(item);





    if (ret < 0) {

    if (ret < 0) {