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

Commit 220f5615 authored by Hangyu Kuang's avatar Hangyu Kuang
Browse files

Revert^5 "Conditional start the media.transcoding service."" 

This reverts commit 2e57b535.

Reason for revert: The change actually makes the service start from beginning instead of lazy start.
The test that this CL is supposed to fix should be fixed now with new mainline module prebuilt.

Bug: 193008207

Change-Id: If1b4ef3e6d55087a443d0826eb25068b51bb6bf9
parent 2e57b535

media/mediaserver/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ cc_binary { 
        "android.hardware.media.omx@1.0",

        "libandroidicu",

        "libfmq",

        "libbase",

        "libbinder",

        "libhidlbase",

        "liblog",

media/mediaserver/main_mediaserver.cpp

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

//#define LOG_NDEBUG 0



#include <android-base/properties.h>

#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>
@@ -43,12 +42,6 @@ int main(int argc __unused, char **argv __unused) 
    ResourceManagerService::instantiate();

    registerExtensions();

    ::android::hardware::configureRpcThreadpool(16, false);



    if (!android::base::GetBoolProperty("ro.config.low_ram", false)) {

        // Start the media.transcoding service if the device is not low ram

        // device.

        android::base::SetProperty("ctl.start", "media.transcoding");

    }

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

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

    ::android::hardware::joinRpcThreadpool();