commit a45c300fcad38e23107b3ad8dd1d3935f5127f9c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 23 18:55:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 23 18:55:14 2017 +0000
tree ebb1fdbb397479e9bd836f24e1ad3acd37ea6331
parent 99c915d334e3810784474900297ee13d7523e61c
parent 373580e1d51d3e89c16612998a10105fea09c3c5

Merge "OMX: don't respect binderization toggle."

cmds/stagefright/stagefright.cpp

diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index ffa09eb..86ff47a 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("persist.hal.binderization", 0))) {
+                property_get_bool("omx.binderization", 0))) {
             using namespace ::android::hardware::media::omx::V1_0;
             sp<IOmx> tOmx = IOmx::getService();
 

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index a8b6c66..db193a3 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("persist.hal.binderization", 0))) {
+            property_get_bool("omx.binderization", 0))) {
         // Treble IOmx
         sp<IOmx> omx = IOmx::getService();
         if (omx == nullptr) {

media/libmediaplayerservice/MediaRecorderClient.cpp

diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index c00a951..1d53a73 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("persist.hal.binderization", 0))) {
+            property_get_bool("omx.binderization", 0))) {
         // Treble IOmx
         sp<IOmx> omx = IOmx::getService();
         if (omx == nullptr) {

media/libstagefright/OMXClient.cpp

diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp
index b77ee1d..a384e13 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("persist.hal.binderization", 0))) {
+            property_get_bool("omx.binderization", 0))) {
         if (trebleFlag != nullptr) {
             *trebleFlag = true;
         }

media/libstagefright/omx/tests/OMXHarness.cpp

diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp
index 8817cf9..69a8982 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("persist.hal.binderization", 0))) {
+            property_get_bool("omx.binderization", 0))) {
         using namespace ::android::hardware::media::omx::V1_0;
         sp<IOmx> tOmx = IOmx::getService();
         if (tOmx == nullptr) {

services/mediacodec/main_codecservice.cpp

diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index 688c651..b273e3f 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -53,7 +53,7 @@
 
     int32_t trebleOmx = property_get_int32("persist.media.treble_omx", -1);
     if ((trebleOmx == 1) || ((trebleOmx == -1) &&
-            property_get_bool("persist.hal.binderization", 0))) {
+            property_get_bool("omx.binderization", 0))) {
         using namespace ::android::hardware::media::omx::V1_0;
         sp<IOmx> omx = new implementation::Omx();
         if (omx == nullptr) {