| commit | 61067e5e56b68b0f698d4cc1701f9d7392e4ae49 | [log] [tgz] |
|---|---|---|
| author | vichang <vichang@google.com> | Tue Oct 20 20:23:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 20 20:23:05 2020 +0000 |
| tree | 73a34908bed96c304d1bd0c0834addbde4dac183 | |
| parent | c31812c4a32330fa2971002c20c2ec787d1a3a0d [diff] | |
| parent | d321357cc0e701bab05f928ffa813273e2ef26dc [diff] |
Merge "Remove AIcu_initializeIcuOrDie() call" am: 0eeb519aa6 am: 975aa24a21 am: d321357cc0 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1450136 Change-Id: Ibb4a3ec16e2fc94aaa1d622c397fc0cf3fc0545b
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp index 316732b..58e2d2a 100644 --- a/media/mediaserver/main_mediaserver.cpp +++ b/media/mediaserver/main_mediaserver.cpp
@@ -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 @@ sp<ProcessState> proc(ProcessState::self()); sp<IServiceManager> sm(defaultServiceManager()); ALOGI("ServiceManager: %p", sm.get()); - AIcu_initializeIcuOrDie(); MediaPlayerService::instantiate(); ResourceManagerService::instantiate(); registerExtensions();