commit 1e703acbf4cf7a1f8f98ed9b38e28cb49d43b4f5
author Hangyu Kuang <hkuang@google.com> Fri Jul 23 21:30:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 23 21:30:50 2021 +0000
tree cdad871054bd0a699070944c3658484407b502a9
parent f7c2bc6d551d9f2e5bdc8f2eac51c2d3f69682f7
parent f96df71bf4af88236240ec2993f33a079036ea0b

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

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

Change-Id: I7be5f100e53253ae5b36edc4755db63618ac973d

media/mediaserver/Android.bp

diff --git a/media/mediaserver/Android.bp b/media/mediaserver/Android.bp
index 79b192e..e25658f 100644
--- a/media/mediaserver/Android.bp
+++ b/media/mediaserver/Android.bp
@@ -35,7 +35,6 @@
         "android.hardware.media.omx@1.0",
         "libandroidicu",
         "libfmq",
-        "libbase",
         "libbinder",
         "libhidlbase",
         "liblog",

media/mediaserver/main_mediaserver.cpp

diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index dc1b9b8..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 <android-base/properties.h>
 #include <binder/IPCThreadState.h>
 #include <binder/ProcessState.h>
 #include <binder/IServiceManager.h>
@@ -43,12 +42,6 @@
     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();