| commit | 2092245ab72182301ae0835762f4d442e3affbaf | [log] [tgz] |
|---|---|---|
| author | T.J. Mercier <tjmercier@google.com> | Wed Dec 21 19:39:43 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 21 19:39:43 2022 +0000 |
| tree | 4075c11cd05cdb3a410f041a5f218f1da2d3df6a | |
| parent | 7f45627502f86c751a8d98231decc6518895277b [diff] | |
| parent | ac92461dbede269ac75abc7a11b9b1a13a9830e0 [diff] |
Merge "Rename: ReadDmaBufs -> ReadProcfsDmaBufs" am: ac92461dbe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2362224 Change-Id: I9f4fbe5d964acce1e46963148e12399d8d0fccd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/jni/com_android_internal_os_KernelAllocationStats.cpp b/core/jni/com_android_internal_os_KernelAllocationStats.cpp index 5b10497..35c9487 100644 --- a/core/jni/com_android_internal_os_KernelAllocationStats.cpp +++ b/core/jni/com_android_internal_os_KernelAllocationStats.cpp
@@ -44,7 +44,7 @@ static jobjectArray KernelAllocationStats_getDmabufAllocations(JNIEnv *env, jobject) { std::vector<DmaBuffer> buffers; - if (!dmabufinfo::ReadDmaBufs(&buffers)) { + if (!dmabufinfo::ReadProcfsDmaBufs(&buffers)) { return nullptr; }