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

Commit 531f520b authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "Remove dependency on persist.hal.binderization." into oc-dev 

am: 4d5f24ab

Change-Id: Id7ffcbf4782ef588d90e5befb59294048fd5dcfb
parents 50c746b8 4d5f24ab

cmds/stagefright/stagefright.cpp

+1 −3
Original line number Diff line number Diff line
@@ -908,9 +908,7 @@ int main(int argc, char **argv) { 


    if (listComponents) {

        sp<IOMX> omx;

        int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

        if ((trebleOmx == 1) || ((trebleOmx == -1) &&

                property_get_bool("persist.hal.binderization", 0))) {

        if (property_get_bool("persist.media.treble_omx", true)) {

            using namespace ::android::hardware::media::omx::V1_0;

            sp<IOmx> tOmx = IOmx::getService();

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −3
Original line number Diff line number Diff line
@@ -736,9 +736,7 @@ sp<MediaPlayerBase> MediaPlayerService::Client::setDataSource_pre( 
    mExtractorDeathListener = new ServiceDeathNotifier(binder, p, MEDIAEXTRACTOR_PROCESS_DEATH);

    binder->linkToDeath(mExtractorDeathListener);



    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

    if (property_get_bool("persist.media.treble_omx", true)) {

        // Treble IOmx

        sp<IOmx> omx = IOmx::getService();

        if (omx == nullptr) {

media/libmediaplayerservice/MediaRecorderClient.cpp

+1 −3
Original line number Diff line number Diff line
@@ -450,9 +450,7 @@ status_t MediaRecorderClient::setListener(const sp<IMediaRecorderClient>& listen 
    }

    sCameraChecked = true;



    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

    if (property_get_bool("persist.media.treble_omx", true)) {

        // Treble IOmx

        sp<IOmx> omx = IOmx::getService();

        if (omx == nullptr) {

media/libstagefright/OMXClient.cpp

+1 −3
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ OMXClient::OMXClient() { 
}



status_t OMXClient::connect(bool* trebleFlag) {

    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

    if (property_get_bool("persist.media.treble_omx", true)) {

        if (trebleFlag != nullptr) {

            *trebleFlag = true;

        }

media/libstagefright/omx/tests/OMXHarness.cpp

+1 −3
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ status_t Harness::initCheck() const { 
}



status_t Harness::initOMX() {

    int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);

    if ((trebleOmx == 1) || ((trebleOmx == -1) &&

            property_get_bool("persist.hal.binderization", 0))) {

    if (property_get_bool("persist.media.treble_omx", true)) {

        using namespace ::android::hardware::media::omx::V1_0;

        sp<IOmx> tOmx = IOmx::getService();

        if (tOmx == nullptr) {