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

Commit 1e703acb authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Automerger Merge Worker
Browse files

Merge "Revert^5 "Conditional start the media.transcoding service.""" into sc-dev am: f96df71b 

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

Change-Id: I7be5f100e53253ae5b36edc4755db63618ac973d
parents f7c2bc6d f96df71b

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();