| commit | cc3ff95870405880e3f4e48146c78ad45eff0bc0 | [log] [tgz] |
|---|---|---|
| author | Kalesh Singh <kaleshsingh@google.com> | Fri Apr 09 19:39:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 19:39:35 2021 +0000 |
| tree | bdf62ff5de2f5c286f97cc42c92189f5ee58a712 | |
| parent | b9f27efacc213e5799216058ddc708425bb4bb4e [diff] | |
| parent | 9462980cdd8ec5b8dc640a69ecc034c6264eadda [diff] |
Merge "Don't retry getting memtrack hal service" am: 64eff6c182 am: 61b934888b am: 9462980cdd Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1671006 Change-Id: I62f2bc42d90243f0d3a687d904e3352e6471dbc4
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(