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

Commit 3516b25e authored by Steven Moreland's avatar Steven Moreland
Browse files

Remove waitForHwService for ashmem. 

Now that b/34772726 is fixed, we can remove this temporary code.

Bug: 34772726
Test: audio works on marlin
Change-Id: I1a268e7030d27b4e944659bd7d82ba321be13a6e
parent 231653e9

media/libaudiohal/EffectsFactoryHalHidl.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -17,9 +17,7 @@ 
#define LOG_TAG "EffectsFactoryHalHidl"

#define LOG_TAG "EffectsFactoryHalHidl"

//#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0





#include <android/hidl/allocator/1.0/IAllocator.h>

#include <cutils/native_handle.h>

#include <cutils/native_handle.h>

#include <hidl/ServiceManagement.h>

#include <media/EffectsFactoryApi.h>

#include <media/EffectsFactoryApi.h>





#include "ConversionHelperHidl.h"

#include "ConversionHelperHidl.h"
@@ -47,10 +45,6 @@ bool EffectsFactoryHalInterface::isNullUuid(const effect_uuid_t *pEffectUuid) { 




EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory") {

EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory") {

    mEffectsFactory = IEffectsFactory::getService();

    mEffectsFactory = IEffectsFactory::getService();

    // TODO: Waiting should not be needed (b/34772726).

    // Also remove include of IAllocator.h and ServiceManagement.h

    android::hardware::details::waitForHwService(

            hidl::allocator::V1_0::IAllocator::descriptor, "ashmem");

}

}





EffectsFactoryHalHidl::~EffectsFactoryHalHidl() {

EffectsFactoryHalHidl::~EffectsFactoryHalHidl() {