commit e30924539ac1cf2383ea934f49ac69454afec613
author Connor O'Brien <connoro@google.com> Mon Aug 17 18:37:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 17 18:37:05 2020 +0000
tree 442761243ae18626fd2069577bfcc032a461e111
parent 07d88cbc1dee846de175d8629d131b5a6c94e55f
parent 5be652dbf2ad18de4e2fb547b4d72faad584b726

Merge "libtimeinstate: improve error handling in single-UID functions" am: 5be652dbf2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1401471

Change-Id: I2cc6c8e4d63f000e448d621e19da90f4d23c1e31

libs/cputimeinstate/cputimeinstate.cpp

diff --git a/libs/cputimeinstate/cputimeinstate.cpp b/libs/cputimeinstate/cputimeinstate.cpp
index b2ebf5d..e56c799 100644
--- a/libs/cputimeinstate/cputimeinstate.cpp
+++ b/libs/cputimeinstate/cputimeinstate.cpp
@@ -251,7 +251,7 @@
     for (uint32_t i = 0; i <= (maxFreqCount - 1) / FREQS_PER_ENTRY; ++i) {
         key.bucket = i;
         if (findMapEntry(gTisMapFd, &key, vals.data())) {
-            if (errno != ENOENT) return {};
+            if (errno != ENOENT || getFirstMapKey(gTisMapFd, &key)) return {};
             continue;
         }
 
@@ -362,7 +362,7 @@
     time_key_t key = {.uid = uid};
     for (key.bucket = 0; key.bucket <= (gNCpus - 1) / CPUS_PER_ENTRY; ++key.bucket) {
         if (findMapEntry(gConcurrentMapFd, &key, vals.data())) {
-            if (errno != ENOENT) return {};
+            if (errno != ENOENT || getFirstMapKey(gConcurrentMapFd, &key)) return {};
             continue;
         }
         auto offset = key.bucket * CPUS_PER_ENTRY;