From 1d63546de956f152469cbbf015e301d14be34cbe Mon Sep 17 00:00:00 2001
From: "Haoran.Wang" <elven.wang@nxp.com>
Date: Tue, 17 Dec 2019 15:18:55 +0800
Subject: [PATCH] add default cpu.active power consumption

In CpuPowerCalculator it will calculate the power consumption based on
the PowerProfile. But when the device run on the GSI image, the
PowerProfile will not match the specific device's overlay. The default
power_profile.xml which don't have cpu.active will make some
multiple-cluster device have zero CPU power consumption calculation
result. So added the default value for the cpu.active values which
overlay by many devices.
This patch help below cts-on-gsi get pass:
run cts-on-gsi -m CtsStatsdHostTestCases -t
android.cts.statsd.atom.UidAtomTests#testDeviceCalculatedPowerBlameUid
run cts-on-gsi -m CtsStatsdHostTestCases -t
android.cts.statsd.validation.BatteryStatsValidationTests#testPowerBlameUid

TEST:
run cts -m CtsStatsdHostTestCases -t
android.cts.statsd.atom.UidAtomTests#testDeviceCalculatedPowerBlameUid

Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
---
 core/res/res/xml/power_profile.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/res/res/xml/power_profile.xml b/core/res/res/xml/power_profile.xml
index 899d630a51b72..d8ec72f33ddc5 100644
--- a/core/res/res/xml/power_profile.xml
+++ b/core/res/res/xml/power_profile.xml
@@ -51,6 +51,12 @@
       <value>0.1</value> <!-- ~1mA -->
   </array>
 
+  <!-- Additional power consumption by CPU excluding cluster and core when
+       running -->
+  <array name="cpu.active">
+      <value>0.1</value>
+  </array>
+
   <!-- A list of heterogeneous CPU clusters, where the value for each cluster represents the
        number of CPU cores for that cluster.