| commit | 8fddcd37d25e4d1c69c260b9bc2b64e931edad32 | [log] [tgz] |
|---|---|---|
| author | Hridya Valsaraju <hridya@google.com> | Wed Aug 11 21:15:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 11 21:15:53 2021 +0000 |
| tree | f71e233c230fb661f6af0aa5c05e6760a7f243fb | |
| parent | 7787a088cce4d1d93facd3a236bba1399e9b48bd [diff] | |
| parent | 6bfd49e95e26465b69be9ff39e48fd9cecd0cb8b [diff] |
libdmabufheap: Do not create heap mappings without ION support am: 0f2cc9e07e am: d2e5cc71c9 am: 6bfd49e95e Original change: https://android-review.googlesource.com/c/platform/system/memory/libdmabufheap/+/1792810 Change-Id: Ie76ec18bc224d16bead9adddea5d3a23bf2aef94
diff --git a/BufferAllocator.cpp b/BufferAllocator.cpp index ce075d6..6dc3f68 100644 --- a/BufferAllocator.cpp +++ b/BufferAllocator.cpp
@@ -165,6 +165,9 @@ if (ret >= 0) return 0; + /* If ION support is not detected, ignore the mappings */ + if (ion_fd_ < 0) return 0; + if (uses_legacy_ion_iface_ || ion_heap_name == "") { ret = MapNameToIonMask(heap_name, legacy_ion_heap_mask, legacy_ion_heap_flags); } else if (!ion_heap_name.empty()) {