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

Commit e7c7d77d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to r_aml_300900100 for mainline module file: apex/manifest_codec.json 

Change-Id: Ie0085422152005e663dd972a795f595e2f777967
parents 1ddd2f3d bdda0c3c

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media",

  "version": 300900000

  "version": 300900100

}

apex/manifest_codec.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media.swcodec",

  "version": 300900000

  "version": 300900100

}

media/codec2/sfplugin/CCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1865,7 +1865,7 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 
                config->mInputSurface->onInputBufferDone(work->input.ordinal.frameIndex);

            }

            mChannel->onWorkDone(

                    std::move(work), changed ? config->mOutputFormat : nullptr,

                    std::move(work), changed ? config->mOutputFormat->dup() : nullptr,

                    initData.hasChanged() ? initData.update().get() : nullptr);

            break;

        }

media/mediaserver/Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -15,13 +15,14 @@ cc_binary { 
    srcs: ["main_mediaserver.cpp"],



    shared_libs: [

        "libresourcemanagerservice",

        "android.hardware.media.omx@1.0",

        "libandroidicu",

        "libbinder",

        "libhidlbase",

        "liblog",

        "libmediaplayerservice",

        "libresourcemanagerservice",

        "libutils",

        "libbinder",

        "libandroidicu",

        "android.hardware.media.omx@1.0",

    ],



    static_libs: [

media/mediaserver/main_mediaserver.cpp

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <hidl/HidlTransportSupport.h>

#include <utils/Log.h>

#include "RegisterExtensions.h"
@@ -42,6 +43,8 @@ int main(int argc __unused, char **argv __unused) 
    MediaPlayerService::instantiate();

    ResourceManagerService::instantiate();

    registerExtensions();

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

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

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

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

}