summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-01-27 00:48:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-27 00:48:29 +0000
commit81fa7ee9c352d277111db92ce97f375c1ffeb3fd (patch)
tree23375f2a02a9d2bb927db3a5780f41229228e5ab
parent26dcb669e8c728bc034c6cfc63cac086fc576f60 (diff)
parentc282248fd7c6d1e8a4fa2f4a91e52186aee52082 (diff)
Merge "Avoid integer underflow involving maxFreqCount." am: c282248fd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1558465 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I71b4123571ad13006eceacc5b0cc9cd63f77a8a8
-rw-r--r--libs/cputimeinstate/cputimeinstate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/cputimeinstate/cputimeinstate.cpp b/libs/cputimeinstate/cputimeinstate.cpp
index 2e72cc422c..462f0db97b 100644
--- a/libs/cputimeinstate/cputimeinstate.cpp
+++ b/libs/cputimeinstate/cputimeinstate.cpp
@@ -99,7 +99,7 @@ static bool initGlobals() {
struct dirent **dirlist;
const char basepath[] = "/sys/devices/system/cpu/cpufreq";
int ret = scandir(basepath, &dirlist, isPolicyFile, comparePolicyFiles);
- if (ret == -1) return false;
+ if (ret == -1 || ret == 0) return false;
gNPolicies = ret;
std::vector<std::string> policyFileNames;