commit 64eff6c18215bf4c70ce8b56d2c1304157260bec
author Kalesh Singh <kaleshsingh@google.com> Fri Apr 09 17:30:06 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 09 17:30:06 2021 +0000
tree 60a6bfcc426c517ae770aab7dc7cb8f7ea3b34ec
parent 2c2c5d197f62ed846b100a29335982c45a1b3c94
parent 161495e2edf7d5c26cfb3923a50b4f9ad27f31d2

Merge "Don't retry getting memtrack hal service"

services/memtrackproxy/MemtrackProxy.cpp

diff --git a/services/memtrackproxy/MemtrackProxy.cpp b/services/memtrackproxy/MemtrackProxy.cpp
index 8da6e89..4676167 100644
--- a/services/memtrackproxy/MemtrackProxy.cpp
+++ b/services/memtrackproxy/MemtrackProxy.cpp
@@ -122,11 +122,9 @@
 
     _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(