summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kalesh Singh <kaleshsingh@google.com> 2021-04-08 19:56:01 -0400
committer Kalesh Singh <kaleshsingh@google.com> 2021-04-09 00:02:03 +0000
commit161495e2edf7d5c26cfb3923a50b4f9ad27f31d2 (patch)
tree60a6bfcc426c517ae770aab7dc7cb8f7ea3b34ec
parent2c2c5d197f62ed846b100a29335982c45a1b3c94 (diff)
Don't retry getting memtrack hal service
On devices where the AIDL memtrack hal is absent, this can cause many service manager errors in logcat, since we retry getting the AIDL hal for each getMemory() call. servicemanager: Could not find android.hardware.memtrack.IMemtrack/defaut ... The hal services get started before we start the proxy service, so it's ok to remove this retry. Bug: 177664629 Test: Manual Change-Id: I2512e7eef0224d36827c0a4611373d0655cefc2f
-rw-r--r--services/memtrackproxy/MemtrackProxy.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/memtrackproxy/MemtrackProxy.cpp b/services/memtrackproxy/MemtrackProxy.cpp
index 8da6e894eb..467616724a 100644
--- a/services/memtrackproxy/MemtrackProxy.cpp
+++ b/services/memtrackproxy/MemtrackProxy.cpp
@@ -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(