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

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

Merge changes from topic "revert-14534667-conditional-start-CLSCYPWXDT" into... 

Merge changes from topic "revert-14534667-conditional-start-CLSCYPWXDT" into sc-dev am: f0d367c5 am: 13b569f8

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

Change-Id: Ib0e1efe3c52d2c560501d55ba08928fbbbcb39f7
parents f2b88bce 13b569f8

apex/mediatranscoding.rc

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,4 +8,5 @@ service media.transcoding /apex/com.android.media/bin/mediatranscoding 
    ioprio rt 4

    ioprio rt 4

    # Restrict to little cores only with system-background cpuset.

    # Restrict to little cores only with system-background cpuset.

    writepid /dev/cpuset/system-background/tasks

    writepid /dev/cpuset/system-background/tasks

    interface aidl media.transcoding

    disabled
 
    disabled

services/mediatranscoding/MediaTranscodingService.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -132,10 +132,10 @@ binder_status_t MediaTranscodingService::dump(int fd, const char** /*args*/, uin 
void MediaTranscodingService::instantiate() {

void MediaTranscodingService::instantiate() {

    std::shared_ptr<MediaTranscodingService> service =

    std::shared_ptr<MediaTranscodingService> service =

            ::ndk::SharedRefBase::make<MediaTranscodingService>();

            ::ndk::SharedRefBase::make<MediaTranscodingService>();

    binder_status_t status =

    if (__builtin_available(android __TRANSCODING_MIN_API__, *)) {

            AServiceManager_addService(service->asBinder().get(), getServiceName());

        // Once service is started, we want it to stay even is client side perished.

    if (status != STATUS_OK) {

        AServiceManager_forceLazyServicesPersist(true /*persist*/);

        return;

        (void)AServiceManager_registerLazyService(service->asBinder().get(), getServiceName());

    }

    }

}

}

services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -481,7 +481,7 @@ public: 
        // Need thread pool to receive callbacks, otherwise oneway callbacks are

        // Need thread pool to receive callbacks, otherwise oneway callbacks are

        // silently ignored.

        // silently ignored.

        ABinderProcess_startThreadPool();

        ABinderProcess_startThreadPool();

        ::ndk::SpAIBinder binder(AServiceManager_getService("media.transcoding"));

        ::ndk::SpAIBinder binder(AServiceManager_waitForService("media.transcoding"));

        mService = IMediaTranscodingService::fromBinder(binder);

        mService = IMediaTranscodingService::fromBinder(binder);

        if (mService == nullptr) {

        if (mService == nullptr) {

            ALOGE("Failed to connect to the media.trascoding service.");

            ALOGE("Failed to connect to the media.trascoding service.");