| commit | c748753b159e3a089d653e949b0e9388feb2b9bf | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon May 02 22:58:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 02 22:58:46 2022 +0000 |
| tree | 88d4608ced8d0c7b3088577c3f4d068e7662c8d6 | |
| parent | ca97912e2238522cafb57b1fa59dbc46b4226d15 [diff] | |
| parent | 20f2a5414065184a768f763ab3c27e9a7a99177c [diff] |
Merge "fix first_api_level property fail in VF projects" into tm-dev am: dd890b5845 am: 20f2a54140 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18092208 Change-Id: Idfbfaf2bd482ec97072d55b1cf444dc191275c2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp b/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp old mode 100644 new mode 100755 index 5fa13e7..2ae9c2b --- a/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp +++ b/media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp
@@ -375,6 +375,11 @@ } static int getFirstApiLevel() { + int boardApiLevel = android::base::GetIntProperty("ro.board.first_api_level", 0); + if (boardApiLevel != 0) { + return boardApiLevel; + } + return android::base::GetIntProperty("ro.product.first_api_level", __ANDROID_API_T__); }