| commit | f1e459c6400a774d99390227e853a30f58cee4a2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 23 17:19:43 2017 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue May 02 23:31:15 2017 +0000 |
| tree | 2d5bfd247ecb5c45fced8560d2dce5e523d6618d | |
| parent | 01506e4ad26d1f1bf5b81121a8d17b3305940eab [diff] |
Fix apps using Adobe AIR. Apps that use Adobe AIR are all broken because the symbol _ZN7android9OMXClient7connectEv disappeared. If we use overloading for OMXClient::connect rather than a default parameter, that gives us another release to reach out to the app authors. Bug: http://b/35325668 Bug: http://b/35454864 Bug: http://b/36106661 Bug: http://b/36263763 Bug: http://b/36501801 Bug: http://b/37176992 Test: ran broken apps Change-Id: Ic310fc0e69be322f007601d23bb4bf82df215036 (cherry picked from commit 9f3f8dd774753c5ed2dfabde65d440182bfaa02e)
diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp index 02d275b..5f9aa01 100644 --- a/media/libstagefright/OMXClient.cpp +++ b/media/libstagefright/OMXClient.cpp
@@ -37,6 +37,10 @@ OMXClient::OMXClient() { } +status_t OMXClient::connect() { + return connect(nullptr); +} + status_t OMXClient::connect(bool* trebleFlag) { if (property_get_bool("persist.media.treble_omx", true)) { if (trebleFlag != nullptr) {
diff --git a/media/libstagefright/include/OMXClient.h b/media/libstagefright/include/OMXClient.h index 315f19b..203a181 100644 --- a/media/libstagefright/include/OMXClient.h +++ b/media/libstagefright/include/OMXClient.h
@@ -26,7 +26,9 @@ public: OMXClient(); - status_t connect(bool* trebleFlag = nullptr); + status_t connect(); + status_t connect(bool* trebleFlag); + status_t connectLegacy(); status_t connectTreble(); void disconnect();