Revert "OMX: don't respect binderization toggle."
This reverts commit 373580e1d51d3e89c16612998a10105fea09c3c5.
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 86ff47a..ffa09eb 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -910,7 +910,7 @@
sp<IOMX> omx;
int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);
if ((trebleOmx == 1) || ((trebleOmx == -1) &&
- property_get_bool("omx.binderization", 0))) {
+ property_get_bool("persist.hal.binderization", 0))) {
using namespace ::android::hardware::media::omx::V1_0;
sp<IOmx> tOmx = IOmx::getService();
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index db193a3..a8b6c66 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -738,7 +738,7 @@
int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);
if ((trebleOmx == 1) || ((trebleOmx == -1) &&
- property_get_bool("omx.binderization", 0))) {
+ property_get_bool("persist.hal.binderization", 0))) {
// Treble IOmx
sp<IOmx> omx = IOmx::getService();
if (omx == nullptr) {
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index 1d53a73..c00a951 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/media/libmediaplayerservice/MediaRecorderClient.cpp
@@ -452,7 +452,7 @@
int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);
if ((trebleOmx == 1) || ((trebleOmx == -1) &&
- property_get_bool("omx.binderization", 0))) {
+ property_get_bool("persist.hal.binderization", 0))) {
// Treble IOmx
sp<IOmx> omx = IOmx::getService();
if (omx == nullptr) {
diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp
index a384e13..b77ee1d 100644
--- a/media/libstagefright/OMXClient.cpp
+++ b/media/libstagefright/OMXClient.cpp
@@ -40,7 +40,7 @@
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("omx.binderization", 0))) {
+ property_get_bool("persist.hal.binderization", 0))) {
if (trebleFlag != nullptr) {
*trebleFlag = true;
}
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp
index 69a8982..8817cf9 100644
--- a/media/libstagefright/omx/tests/OMXHarness.cpp
+++ b/media/libstagefright/omx/tests/OMXHarness.cpp
@@ -80,7 +80,7 @@
status_t Harness::initOMX() {
int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);
if ((trebleOmx == 1) || ((trebleOmx == -1) &&
- property_get_bool("omx.binderization", 0))) {
+ property_get_bool("persist.hal.binderization", 0))) {
using namespace ::android::hardware::media::omx::V1_0;
sp<IOmx> tOmx = IOmx::getService();
if (tOmx == nullptr) {
diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index a9872b3..983bbba 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -52,7 +52,7 @@
int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);
if ((trebleOmx == 1) || ((trebleOmx == -1) &&
- property_get_bool("omx.binderization", 0))) {
+ property_get_bool("persist.hal.binderization", 0))) {
using namespace ::android::hardware::media::omx::V1_0;
sp<IOmx> omx = IOmx::getService(true);
if (omx == nullptr) {