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

Commit 721f69a8 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audio:fix incomplete devices of duplicated output" am: 5b346dea am:... 

Merge "audio:fix incomplete devices of duplicated output" am: 5b346dea am: 1b663965 am: afc58847

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

Change-Id: Idb401a5346318db3af4c743e2a88f45d8a5b45ba
parents 0def0894 afc58847

services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h

+3 −1
Original line number Diff line number Diff line
@@ -226,7 +226,9 @@ public: 
            add(devices);

            return size();

        }

        return SortedVector::merge(devices);

        ssize_t ret = SortedVector::merge(devices);

        refreshTypes();

        return ret;

    }



    /**