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

Commit 8397f288 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Support old libaudiopolicy binaries" into gingerbread

parents 8543d04f db5456b6

services/audioflinger/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ ifeq ($(BOARD_USE_BROADCOM_FM_VOLUME_HACK),true) 
  LOCAL_CFLAGS += -DUSE_BROADCOM_FM_VOLUME_HACK

endif



ifeq ($(BOARD_USES_FROYO_AUDIOPOLICY),true)

  LOCAL_CFLAGS += -DFROYO_AUDIOPOLICY

endif



ifeq ($(TARGET_SIMULATOR),true)

    ifeq ($(HOST_OS),linux)

        LOCAL_LDLIBS += -lrt -lpthread

services/audioflinger/AudioPolicyService.cpp

+12 −0
Original line number Diff line number Diff line
@@ -348,6 +348,9 @@ status_t AudioPolicyService::getStreamVolumeIndex(AudioSystem::stream_type strea 


uint32_t AudioPolicyService::getStrategyForStream(AudioSystem::stream_type stream)

{

#ifdef FROYO_AUDIOPOLICY

    return 0;

#endif

    if (mpPolicyManager == NULL) {

        return 0;

    }
@@ -356,6 +359,9 @@ uint32_t AudioPolicyService::getStrategyForStream(AudioSystem::stream_type strea 


audio_io_handle_t AudioPolicyService::getOutputForEffect(effect_descriptor_t *desc)

{

#ifdef FROYO_AUDIOPOLICY

    return NO_INIT;

#endif

    if (mpPolicyManager == NULL) {

        return NO_INIT;

    }
@@ -369,6 +375,9 @@ status_t AudioPolicyService::registerEffect(effect_descriptor_t *desc, 
                                int session,

                                int id)

{

#ifdef FROYO_AUDIOPOLICY

    return NO_INIT;

#endif

    if (mpPolicyManager == NULL) {

        return NO_INIT;

    }
@@ -377,6 +386,9 @@ status_t AudioPolicyService::registerEffect(effect_descriptor_t *desc, 


status_t AudioPolicyService::unregisterEffect(int id)

{

#ifdef FROYO_AUDIOPOLICY

    return NO_INIT;

#endif

    if (mpPolicyManager == NULL) {

        return NO_INIT;

    }