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

Commit e15e68ae authored by Kalesh Singh's avatar Kalesh Singh Committed by Automerger Merge Worker
Browse files

Merge "Memtrack: Fallback to HIDL implementation" am: 65fac116 am:... 

Merge "Memtrack: Fallback to HIDL implementation" am: 65fac116 am: 4c6a07a5 am: 0c7c984a am: 4b20f921

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2469944



Change-Id: I5d8f25d421f35edaf4a6c2a70d97c241cc19b0a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b626eb1 4b20f921

services/memtrackproxy/MemtrackProxy.cpp

+8 −3
Original line number Diff line number Diff line
@@ -97,9 +97,14 @@ bool MemtrackProxy::CheckPid(pid_t calling_pid, pid_t request_pid) { 
    return calling_pid == request_pid;

}



MemtrackProxy::MemtrackProxy()

      : memtrack_hidl_instance_(MemtrackProxy::MemtrackHidlInstance()),

        memtrack_aidl_instance_(MemtrackProxy::MemtrackAidlInstance()) {}

MemtrackProxy::MemtrackProxy() {

    memtrack_aidl_instance_ = MemtrackProxy::MemtrackAidlInstance();



    // Only check for a HIDL implementation if we failed to get the AIDL service

    if (!memtrack_aidl_instance_) {

        memtrack_hidl_instance_ = MemtrackProxy::MemtrackHidlInstance();

    }

}



ndk::ScopedAStatus MemtrackProxy::getMemory(int pid, MemtrackType type,

                                            std::vector<MemtrackRecord>* _aidl_return) {