diff options
| author | 2020-09-11 23:14:20 +0000 | |
|---|---|---|
| committer | 2020-09-11 23:14:20 +0000 | |
| commit | fb1fbf5a43e30ffa7f385b494b488ed340b9d11c (patch) | |
| tree | 6c0a17b3398cd0c9eaf88410700aef3c3c88d6fd | |
| parent | dd985e32f215fb92e7ca174cbe9fd8a73343e414 (diff) | |
| parent | ec3b36a49b0dc802a7dbdb15b2836c1afe6be98f (diff) | |
Snap for 6828801 from ec3b36a49b0dc802a7dbdb15b2836c1afe6be98f to rvc-qpr1-release
Change-Id: Ifeca626065ce2d5240a4e8543aa7d1770a146b39
| -rw-r--r-- | libs/arect/Android.bp | 2 | ||||
| -rw-r--r-- | services/stats/StatsHal.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/arect/Android.bp b/libs/arect/Android.bp index 258a4e3748..80aa8916da 100644 --- a/libs/arect/Android.bp +++ b/libs/arect/Android.bp @@ -22,6 +22,8 @@ ndk_headers { cc_library_headers { name: "libarect_headers", + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, export_include_dirs: ["include"], } diff --git a/services/stats/StatsHal.cpp b/services/stats/StatsHal.cpp index 80c3b65ae8..ae0a9843f6 100644 --- a/services/stats/StatsHal.cpp +++ b/services/stats/StatsHal.cpp @@ -58,7 +58,7 @@ hardware::Return<void> StatsHal::reportChargeCycles(const ChargeCycles& chargeCy std::vector<int32_t> buckets = chargeCycles.cycleBucket; int initialSize = buckets.size(); for (int i = 0; i < 10 - initialSize; i++) { - buckets.push_back(-1); // Push -1 for buckets that do not exist. + buckets.push_back(0); // Push 0 for buckets that do not exist. } android::util::stats_write(android::util::CHARGE_CYCLES_REPORTED, buckets[0], buckets[1], buckets[2], buckets[3], buckets[4], buckets[5], buckets[6], buckets[7], buckets[8], |