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

Commit 7c66f8e5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I7b191974,Ic048423f 

* changes:
  audioserver: Increase hwbinder thread pool size
  Revert "audioserver: enable HIDL callbacks"
parents cb6124dc 00a21a30

media/audioserver/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -13,11 +13,12 @@ LOCAL_SHARED_LIBRARIES := \ 
	libbinder \

	libcutils \

	liblog \

	libhidltransport \

	libhwbinder \

	libmedialogservice \

	libnbaio \

	libsoundtriggerservice \

	libutils \

	libhwbinder

	libutils



# TODO oboeservice is the old folder name for aaudioservice. It will be changed.

LOCAL_C_INCLUDES := \

media/audioserver/main_audioserver.cpp

+2 −8
Original line number Diff line number Diff line
@@ -25,12 +25,9 @@ 
#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <hidl/HidlTransportSupport.h>

#include <utils/Log.h>



// FIXME: remove when BUG 31748996 is fixed

#include <hwbinder/IPCThreadState.h>

#include <hwbinder/ProcessState.h>



// from LOCAL_C_INCLUDES

#include "aaudio/AAudioTesting.h"

#include "AudioFlinger.h"
@@ -128,6 +125,7 @@ int main(int argc __unused, char **argv) 
            prctl(PR_SET_PDEATHSIG, SIGKILL);   // if parent media.log dies before me, kill me also

            setpgid(0, 0);                      // but if I die first, don't kill my parent

        }

        android::hardware::configureRpcThreadpool(4, false /*callerWillJoin*/);

        sp<ProcessState> proc(ProcessState::self());

        sp<IServiceManager> sm = defaultServiceManager();

        ALOGI("ServiceManager: %p", sm.get());
@@ -145,10 +143,6 @@ int main(int argc __unused, char **argv) 


        SoundTriggerHwService::instantiate();

        ProcessState::self()->startThreadPool();



// FIXME: remove when BUG 31748996 is fixed

        android::hardware::ProcessState::self()->startThreadPool();



        IPCThreadState::self()->joinThreadPool();

    }

}