Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4e1afab authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "Rename: ReadDmaBufs -> ReadProcfsDmaBufs" am: ac92461d am: 2092245a am: bcd5cf6f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2362224



Change-Id: I6603a5f7a9519f63f94d1533559e1b9f8c9c58ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents faa0a9e1 bcd5cf6f

core/jni/com_android_internal_os_KernelAllocationStats.cpp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct PidDmaInfo { 
static jobjectArray KernelAllocationStats_getDmabufAllocations(JNIEnv *env, jobject) {

    std::vector<DmaBuffer> buffers;



    if (!dmabufinfo::ReadDmaBufs(&buffers)) {

    if (!dmabufinfo::ReadProcfsDmaBufs(&buffers)) {

        return nullptr;

    }