| commit | fadeb8a92046c6941db721145de3514cf6015079 | [log] [tgz] |
|---|---|---|
| author | Michael Butler <butlermichael@google.com> | Sun Feb 07 00:11:13 2021 -0800 |
| committer | Michael Butler <butlermichael@google.com> | Wed Feb 17 10:15:09 2021 -0800 |
| tree | 46501456b0f8d992dce71feb55a71aa68c2c432a | |
| parent | 0ace84a193a73e3220b3f74d7de6bbc2b6745368 [diff] [blame] |
Change NNAPI Memory to ref-counted SharedMemory -- hal Bug: 179906132 Test: mma Test: NeuralNetworksTest_static Test: presubmit Change-Id: I6435db906a2efe4938da18149a1fcd6d24730a95 Merged-In: I6435db906a2efe4938da18149a1fcd6d24730a95 (cherry picked from commit 79a16ebb6f42c21a21202f7b63ce372f2df15137)
diff --git a/neuralnetworks/1.2/utils/src/Conversions.cpp b/neuralnetworks/1.2/utils/src/Conversions.cpp index 062f6f7..5055650 100644 --- a/neuralnetworks/1.2/utils/src/Conversions.cpp +++ b/neuralnetworks/1.2/utils/src/Conversions.cpp
@@ -365,7 +365,7 @@ return V1_0::utils::unvalidatedConvert(operandValues); } -nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::Memory& memory) { +nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::SharedMemory& memory) { return V1_0::utils::unvalidatedConvert(memory); }