diff options
| author | Kalesh Singh <kaleshsingh@google.com> | 2021-04-09 18:52:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 18:52:36 +0000 |
| commit | 9462980cdd8ec5b8dc640a69ecc034c6264eadda (patch) | |
| tree | 60a6bfcc426c517ae770aab7dc7cb8f7ea3b34ec | |
| parent | fbfa51ca45489249d2a67bac5f2d1b2095293cea (diff) | |
| parent | 61b934888b860f2b87716418d7da60777bbba320 (diff) | |
| download | native-temp_ab_7272582.tar.gz | |
Merge "Don't retry getting memtrack hal service" am: 64eff6c182 am: 61b934888btemp_ab_7272582
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1671006
Change-Id: Ie9e7f4ac171a91685256313f08bef82189db1c0b
| -rw-r--r-- | services/memtrackproxy/MemtrackProxy.cpp | 6 |
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( |