Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cc2c75d authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power... 

am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread

Merge commit 'c7dacb73' into gingerbread-plus-aosp

* commit 'c7dacb73':
  DO NOT MERGE: Add a battery capacity value to the power profile.
parents eba857d1 c7dacb73

core/java/com/android/internal/os/PowerProfile.java

+18 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,11 @@ public class PowerProfile { 




    public static final String POWER_CPU_SPEEDS = "cpu.speeds";

    public static final String POWER_CPU_SPEEDS = "cpu.speeds";





    /**

     * Battery capacity in milliAmpHour (mAh).

     */

    public static final String POWER_BATTERY_CAPACITY = "battery.capacity";



    static final HashMap<String, Object> sPowerMap = new HashMap<String, Object>();

    static final HashMap<String, Object> sPowerMap = new HashMap<String, Object>();





    private static final String TAG_DEVICE = "device";

    private static final String TAG_DEVICE = "device";
@@ -243,6 +248,19 @@ public class PowerProfile { 
        }

        }

    }

    }





    /**

     * Returns the battery capacity, if available, in milli Amp Hours. If not available,

     * it returns zero.

     * @return the battery capacity in mAh

     */

    public double getBatteryCapacity() {

        return getAveragePower(POWER_BATTERY_CAPACITY);

    }



    /**

     * Returns the number of speeds that the CPU can be run at.

     * @return

     */

    public int getNumSpeedSteps() {

    public int getNumSpeedSteps() {

        Object value = sPowerMap.get(POWER_CPU_SPEEDS);

        Object value = sPowerMap.get(POWER_CPU_SPEEDS);

        if (value != null && value instanceof Double[]) {

        if (value != null && value instanceof Double[]) {

core/res/res/xml/power_profile.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
-->

-->





<device name="Android">

<device name="Android">

  <!-- All values are in mAh except as noted -->

  <item name="none">0</item>

  <item name="none">0</item>

  <item name="screen.on">0.1</item>

  <item name="screen.on">0.1</item>

  <item name="bluetooth.active">0.1</item>

  <item name="bluetooth.active">0.1</item>
@@ -48,4 +49,6 @@ 
  <array name="cpu.active">

  <array name="cpu.active">

      <value>0.2</value>

      <value>0.2</value>

  </array>

  </array>

  <!-- This is the battery capacity in mAh -->

  <item name="battery.capacity">1000</item>

</device>
 
</device>