diff options
| author | Hridya Valsaraju <hridya@google.com> | 2021-08-13 00:56:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 00:56:42 +0000 |
| commit | 9fd19ccd9902d7634c2bcbb82cfe516465676698 (patch) | |
| tree | f71e233c230fb661f6af0aa5c05e6760a7f243fb | |
| parent | 9f424b55cbcbfbf502f45a963c2e3028ca1c6cbc (diff) | |
| parent | 0f2cc9e07eece3faf22b738819675e9a7eaa0870 (diff) | |
| download | libdmabufheap-9fd19ccd9902d7634c2bcbb82cfe516465676698.tar.gz | |
libdmabufheap: Do not create heap mappings without ION support am: 0f2cc9e07e
Original change: https://android-review.googlesource.com/c/platform/system/memory/libdmabufheap/+/1792810
Change-Id: Iace63a6a426cf089d61966d0c0adeca002d960f9
| -rw-r--r-- | BufferAllocator.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/BufferAllocator.cpp b/BufferAllocator.cpp index ce075d6..6dc3f68 100644 --- a/BufferAllocator.cpp +++ b/BufferAllocator.cpp @@ -165,6 +165,9 @@ int BufferAllocator::MapNameToIonHeap(const std::string& heap_name, 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()) { |