commit 953bd54c1d57fd7f4e6ddbdcc6d435aed1f1bb64
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 02 20:03:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 02 20:03:49 2017 +0000
tree c77f2a686c858187dd3537c375a8899fa2058af6
parent 08b1f457bfda89bf3bb88c588152f14a49c7b31f
parent 231404db24c82ac9a6e6fd5fcee88d44e7188757

Merge "libmemtrack: check return value for getMemory()"

libmemtrack/memtrack.cpp

diff --git a/libmemtrack/memtrack.cpp b/libmemtrack/memtrack.cpp
index e83f181..c5e74c1 100644
--- a/libmemtrack/memtrack.cpp
+++ b/libmemtrack/memtrack.cpp
@@ -31,6 +31,7 @@
 using android::hardware::memtrack::V1_0::MemtrackFlag;
 using android::hardware::memtrack::V1_0::MemtrackStatus;
 using android::hardware::hidl_vec;
+using android::hardware::Return;
 
 struct memtrack_proc_type {
     MemtrackType type;
@@ -69,7 +70,7 @@
     if (memtrack == nullptr)
         return -1;
 
-    memtrack->getMemory(pid, type,
+    Return<void> ret = memtrack->getMemory(pid, type,
         [&t, &err](MemtrackStatus status, hidl_vec<MemtrackRecord> records) {
             if (status != MemtrackStatus::SUCCESS) {
                 err = -1;
@@ -81,7 +82,7 @@
                 t->records[i].flags = records[i].flags;
             }
     });
-    return err;
+    return ret.isOk() ? err : -1;
 }
 
 /* TODO: sanity checks on return values from HALs: