| commit | 814bc2250c245ddc03f505e8d0424aae66b3567f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 27 04:18:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 27 04:18:37 2021 +0000 |
| tree | 3ce204518f51fed18070b56a4e6eed89fb772a90 | |
| parent | c684545886122c7e61b00891e455b259fa250087 [diff] | |
| parent | 493dc2524218997f30f0cc5f84b8961284be7d92 [diff] |
Merge "Avoid integer underflow involving maxFreqCount." am: c282248fd7 am: 81fa7ee9c3 am: 493dc25242 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1558465 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0db6e64ae7aa4a4e83e2781746e50c30d10db61e
diff --git a/libs/cputimeinstate/cputimeinstate.cpp b/libs/cputimeinstate/cputimeinstate.cpp index 2e72cc4..462f0db 100644 --- a/libs/cputimeinstate/cputimeinstate.cpp +++ b/libs/cputimeinstate/cputimeinstate.cpp
@@ -99,7 +99,7 @@ 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;