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

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

Merge "Don't retry getting memtrack hal service" am: 64eff6c1 am: 61b93488... 

Merge "Don't retry getting memtrack hal service" am: 64eff6c1 am: 61b93488 am: 9462980c am: cc3ff958

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

Change-Id: I7f7c877bd9993aeaf3c5d74e0de841db4b760fa9
parents 7357742c cc3ff958

services/memtrackproxy/MemtrackProxy.cpp

+2 −4
Original line number Diff line number Diff line
@@ -122,11 +122,9 @@ ndk::ScopedAStatus MemtrackProxy::getMemory(int pid, MemtrackType type, 


    _aidl_return->clear();



    if (memtrack_aidl_instance_ ||

        (memtrack_aidl_instance_ = MemtrackProxy::MemtrackAidlInstance())) {

    if (memtrack_aidl_instance_) {

        return memtrack_aidl_instance_->getMemory(pid, type, _aidl_return);

    } else if (memtrack_hidl_instance_ ||

               (memtrack_hidl_instance_ = MemtrackProxy::MemtrackHidlInstance())) {

    } else if (memtrack_hidl_instance_) {

        ndk::ScopedAStatus aidl_status;



        Return<void> ret = memtrack_hidl_instance_->getMemory(