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

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

Merge "samsung: add support for tvout and yamahaplayer services" into ics

parents 6188d5c4 aa585a5d

cmds/servicemanager/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -12,4 +12,10 @@ LOCAL_MODULE := servicemanager 
ifeq ($(BOARD_USE_LVMX),true)

    LOCAL_CFLAGS += -DLVMX

endif

ifeq ($(BOARD_USE_YAMAHAPLAYER),true)

    LOCAL_CFLAGS += -DYAMAHAPLAYER

endif

ifeq ($(BOARD_USE_SECTVOUT),true)

    LOCAL_CFLAGS += -DSECTVOUT

endif

include $(BUILD_EXECUTABLE)

cmds/servicemanager/service_manager.c

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ static struct { 
    { AID_MEDIA, "media.player" },

    { AID_MEDIA, "media.camera" },

    { AID_MEDIA, "media.audio_policy" },

#ifdef YAMAHAPLAYER

    { AID_MEDIA, "media.yamahaplayer" },

#endif

#ifdef SECTVOUT

    { AID_MEDIA, "SecTVOutService" },

#endif

    { AID_DRM,   "drm.drmManager" },

    { AID_NFC,   "nfc" },

    { AID_RADIO, "radio.phone" },

media/libmedia/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ ifeq ($(BOARD_USES_AUDIO_LEGACY),true) 
    endif

endif



ifeq ($(BOARD_USE_YAMAHAPLAYER),true)

    LOCAL_CFLAGS += -DYAMAHAPLAYER

endif



LOCAL_SHARED_LIBRARIES := \

	libui libcutils libutils libbinder libsonivox libicuuc libexpat \

        libcamera_client libstagefright_foundation \

media/libmedia/AudioSystem.cpp

+20 −0
Original line number Diff line number Diff line
@@ -810,5 +810,25 @@ extern "C" bool _ZN7android11AudioSystem15isLowVisibilityENS0_11stream_typeE(aud 


#endif // AUDIO_LEGACY



#ifdef YAMAHAPLAYER

extern "C" bool _ZN7android11AudioSystem17isSeparatedStreamE19audio_stream_type_t(audio_stream_type_t stream)

{

    LOGD("android::AudioSystem::isSeparatedStream(audio_stream_type_t) called!");

    LOGD("audio_stream_type_t: %d", stream);



/* this is the correct implementation, but breaks headset volume rocker.

    if (stream == 3  || stream == 9  || stream == 10

     || stream == 12 || stream == 13 || stream == 14)

    {

        LOGD("isSeparatedStream: true");

        return true;

    }

*/



    LOGD("isSeparatedStream: false");

    return false;

}

#endif // YAMAHAPLAYER



}; // namespace android

media/mediaserver/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -11,6 +11,16 @@ LOCAL_SHARED_LIBRARIES := \ 
	libutils \

	libbinder



ifeq ($(BOARD_USE_YAMAHAPLAYER),true)

    LOCAL_CFLAGS += -DYAMAHAPLAYER

    LOCAL_SHARED_LIBRARIES += libmediayamahaservice

endif



ifeq ($(BOARD_USE_SECTVOUT),true)

    LOCAL_CFLAGS += -DSECTVOUT

	LOCAL_SHARED_LIBRARIES += libTVOut

endif



base := $(LOCAL_PATH)/../..



LOCAL_C_INCLUDES := \