diff --git a/powerstats/Android.bp b/powerstats/Android.bp index 2dbf8db..74935c7 100644 --- a/powerstats/Android.bp +++ b/powerstats/Android.bp @@ -20,6 +20,5 @@ cc_library { shared_libs: [ "android.hardware.power.stats-impl.pixel", - "libaoc", ], } diff --git a/powerstats/AocStateResidencyDataProvider.cpp b/powerstats/AocStateResidencyDataProvider.cpp index 6ab54db..c64496d 100644 --- a/powerstats/AocStateResidencyDataProvider.cpp +++ b/powerstats/AocStateResidencyDataProvider.cpp @@ -18,8 +18,6 @@ #include -#include - namespace aidl { namespace android { namespace hardware { @@ -28,8 +26,11 @@ namespace stats { AocStateResidencyDataProvider::AocStateResidencyDataProvider(std::vector> ids, std::vector> states) { - // AoC stats are reported in ticks - std::function aocTickToMs = [](uint64_t a) { return aoc_ticks_to_nanoseconds(a) / 1000000; }; + // AoC stats are reported in ticks of 244.140625ns. The transform + // function converts ticks to milliseconds. + // 1000000 / 244.140625 = 4096. + static const uint64_t AOC_CLK = 4096; + std::function aocTickToMs = [](uint64_t a) { return a / AOC_CLK; }; GenericStateResidencyDataProvider::StateResidencyConfig config = { .entryCountSupported = true, .entryCountPrefix = "Counter:",