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

Commit 61067e5e authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Remove AIcu_initializeIcuOrDie() call" am: 0eeb519a am: 975aa24a am: d321357c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1450136

Change-Id: Ibb4a3ec16e2fc94aaa1d622c397fc0cf3fc0545b
parents c31812c4 d321357c

media/mediaserver/main_mediaserver.cpp

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define LOG_TAG "mediaserver"

//#define LOG_NDEBUG 0



#include <aicu/AIcu.h>

#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>
@@ -39,7 +38,6 @@ int main(int argc __unused, char **argv __unused) 
    sp<ProcessState> proc(ProcessState::self());

    sp<IServiceManager> sm(defaultServiceManager());

    ALOGI("ServiceManager: %p", sm.get());

    AIcu_initializeIcuOrDie();

    MediaPlayerService::instantiate();

    ResourceManagerService::instantiate();

    registerExtensions();