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

Commit 34e5d30e authored by Samuel Saccone's avatar Samuel Saccone
Browse files

Revert "Crash audioserver if EPIPE (DEAD_OBJECT) is received from the HAL" 

This reverts commit 9f55e5f9.

Change-Id: Ic76c0cb5032af422699da2b43106b4b1de5ac935
parent 9f55e5f9

media/libaudiohal/ConversionHelperHidl.cpp

+0 −8
Original line number Diff line number Diff line
@@ -82,16 +82,9 @@ status_t ConversionHelperHidl::analyzeResult(const Result& result) { 
    }

}



// static

void ConversionHelperHidl::crashIfHalIsDead(const Status& status) {

    LOG_ALWAYS_FATAL_IF(

            status.transactionError() == DEAD_OBJECT, "HAL server crashed, need to restart");

}



status_t ConversionHelperHidl::processReturn(const char* funcName, const Status& status) {

    const status_t st = status.transactionError();

    ALOGE_IF(st, "%s %p %s: %s (from rpc)", mClassName, this, funcName, strerror(-st));

    crashIfHalIsDead(status);

    return st;

}
@@ -100,7 +93,6 @@ status_t ConversionHelperHidl::processReturn( 
    const status_t st = status.isOk() ? analyzeResult(retval) : status.transactionError();

    ALOGE_IF(!status.isOk() && st, "%s %p %s: %s (from rpc)",

            mClassName, this, funcName, strerror(-st));

    crashIfHalIsDead(status);

    return st;

}

media/libaudiohal/ConversionHelperHidl.h

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ using ::android::hardware::hidl_vec; 
namespace android {



class ConversionHelperHidl {

  public:

    static void crashIfHalIsDead(const Status& status);



  protected:

    static status_t keysFromHal(const String8& keys, hidl_vec<hidl_string> *hidlKeys);

    static status_t parametersFromHal(const String8& kvPairs, hidl_vec<ParameterValue> *hidlParams);

media/libaudiohal/DevicesFactoryHalHidl.cpp

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <android/hardware/audio/2.0/IDevice.h>

#include <utils/Log.h>



#include "ConversionHelperHidl.h"

#include "DeviceHalHidl.h"

#include "DevicesFactoryHalHidl.h"
@@ -83,7 +82,6 @@ status_t DevicesFactoryHalHidl::openDevice(const char *name, sp<DeviceHalInterfa 
        else if (retval == Result::INVALID_ARGUMENTS) return BAD_VALUE;

        else return NO_INIT;

    }

    ConversionHelperHidl::crashIfHalIsDead(ret.getStatus());

    return ret.getStatus().transactionError();

}

media/libaudiohal/EffectHalHidl.cpp

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <media/EffectsFactoryApi.h>

#include <utils/Log.h>



#include "ConversionHelperHidl.h"

#include "EffectHalHidl.h"

#include "HidlUtils.h"
@@ -103,7 +102,6 @@ status_t EffectHalHidl::getDescriptor(effect_descriptor_t *pDescriptor) { 
                    effectDescriptorToHal(result, pDescriptor);

                }

            });

    ConversionHelperHidl::crashIfHalIsDead(ret.getStatus());

    return ret.getStatus().isOk() ? analyzeResult(retval) : ret.getStatus().transactionError();

}

media/libaudiohal/EffectsFactoryHalHidl.cpp

+0 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <cutils/native_handle.h>

#include <media/EffectsFactoryApi.h>



#include "ConversionHelperHidl.h"

#include "EffectHalHidl.h"

#include "EffectsFactoryHalHidl.h"

#include "HidlUtils.h"
@@ -64,7 +63,6 @@ status_t EffectsFactoryHalHidl::queryAllDescriptors() { 
        return retval == Result::OK ? OK : NO_INIT;

    }

    mLastDescriptors.resize(0);

    ConversionHelperHidl::crashIfHalIsDead(ret.getStatus());

    return ret.getStatus().transactionError();

}
@@ -109,7 +107,6 @@ status_t EffectsFactoryHalHidl::getDescriptor( 
        else if (retval == Result::INVALID_ARGUMENTS) return NAME_NOT_FOUND;

        else return NO_INIT;

    }

    ConversionHelperHidl::crashIfHalIsDead(ret.getStatus());

    return ret.getStatus().transactionError();

}
@@ -133,7 +130,6 @@ status_t EffectsFactoryHalHidl::createEffect( 
        else if (retval == Result::INVALID_ARGUMENTS) return NAME_NOT_FOUND;

        else return NO_INIT;

    }

    ConversionHelperHidl::crashIfHalIsDead(ret.getStatus());

    return ret.getStatus().transactionError();

}
@@ -143,7 +139,6 @@ status_t EffectsFactoryHalHidl::dumpEffects(int fd) { 
    hidlHandle->data[0] = fd;

    Return<void> ret = mEffectsFactory->debugDump(hidlHandle);

    native_handle_delete(hidlHandle);

    ConversionHelperHidl::crashIfHalIsDead(ret.getStatus());

    return ret.getStatus().transactionError();

}