diff options
| author | 2023-03-04 08:06:42 +0000 | |
|---|---|---|
| committer | 2023-03-04 08:06:42 +0000 | |
| commit | 4b20f9214b98c5b6ab6df6ec016e6878461ae899 (patch) | |
| tree | 67d0ed982243fa8ea73ee21d5b22f815c041ab71 | |
| parent | 19c659269554a9e427e8c1a146d273f2d5466292 (diff) | |
| parent | 0c7c984a2b2dd822fa11172acb8ad62278c3e764 (diff) | |
Merge "Memtrack: Fallback to HIDL implementation" am: 65fac116d3 am: 4c6a07a53e am: 0c7c984a2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2469944
Change-Id: Ib9138832029da902f5f5fec7f85bb6ba5a801da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/memtrackproxy/MemtrackProxy.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/services/memtrackproxy/MemtrackProxy.cpp b/services/memtrackproxy/MemtrackProxy.cpp index 467616724a..9e41a9333e 100644 --- a/services/memtrackproxy/MemtrackProxy.cpp +++ b/services/memtrackproxy/MemtrackProxy.cpp @@ -97,9 +97,14 @@ bool MemtrackProxy::CheckPid(pid_t calling_pid, pid_t request_pid) { return calling_pid == request_pid; } -MemtrackProxy::MemtrackProxy() - : memtrack_hidl_instance_(MemtrackProxy::MemtrackHidlInstance()), - memtrack_aidl_instance_(MemtrackProxy::MemtrackAidlInstance()) {} +MemtrackProxy::MemtrackProxy() { + memtrack_aidl_instance_ = MemtrackProxy::MemtrackAidlInstance(); + + // Only check for a HIDL implementation if we failed to get the AIDL service + if (!memtrack_aidl_instance_) { + memtrack_hidl_instance_ = MemtrackProxy::MemtrackHidlInstance(); + } +} ndk::ScopedAStatus MemtrackProxy::getMemory(int pid, MemtrackType type, std::vector<MemtrackRecord>* _aidl_return) { |