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

Commit 39e6e6a6 authored by Jyotiraditya Panda's avatar Jyotiraditya Panda Committed by Michael Bestas
Browse files

core: BatteryManager: Add few more Battery broadcast intents 



 * maximum_capacity
 * design_capacity

Change-Id: Idfa9207cc8bd35469876f3094f3bc948741c94bf
Signed-off-by: default avatarJyotiraditya Panda <jyotiraditya@aospa.co>
Signed-off-by: default avatarAdithya R <gh0strider.2k18.reborn@gmail.com>
parent 125409c1

core/java/android/os/BatteryManager.java

+14 −0
Original line number Diff line number Diff line
@@ -163,6 +163,20 @@ public class BatteryManager { 
     */

    public static final String EXTRA_CHARGING_STATUS = "android.os.extra.CHARGING_STATUS";



    /**

     * Extra for {@link android.content.Intent#ACTION_BATTERY_CHANGED}:

     * Int value representing the estimated battery full charge capacity in microampere-hours.

     * {@hide}

     */

    public static final String EXTRA_MAXIMUM_CAPACITY = "android.os.extra.MAXIMUM_CAPACITY";



    /**

     * Extra for {@link android.content.Intent#ACTION_BATTERY_CHANGED}:

     * Int value representing the battery full charge design capacity in microampere-hours.

     * {@hide}

     */

    public static final String EXTRA_DESIGN_CAPACITY = "android.os.extra.DESIGN_CAPACITY";



    /**

     * Extra for {@link android.content.Intent#ACTION_BATTERY_LEVEL_CHANGED}:

     * Contains list of Bundles representing battery events

services/core/java/com/android/server/BatteryService.java

+15 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ public final class BatteryService extends SystemService { 
    private int mLastChargeCounter;

    private int mLastBatteryCycleCount;

    private int mLastCharingState;

    private int mLastBatteryFullCharge;

    private int mLastBatteryFullChargeDesign;



    private int mSequence = 1;
@@ -596,6 +598,9 @@ public final class BatteryService extends SystemService { 
                        || mHealthInfo.maxChargingVoltageMicrovolts != mLastMaxChargingVoltage

                        || mHealthInfo.batteryChargeCounterUah != mLastChargeCounter

                        || mInvalidCharger != mLastInvalidCharger

                        || mHealthInfo.batteryFullChargeUah != mLastBatteryFullCharge

                        || mHealthInfo.batteryFullChargeDesignCapacityUah !=

                                mLastBatteryFullChargeDesign

                        || mHealthInfo.batteryCycleCount != mLastBatteryCycleCount

                        || mBatteryModProps.modLevel != mLastModLevel

                        || mBatteryModProps.modStatus != mLastModStatus
@@ -786,6 +791,8 @@ public final class BatteryService extends SystemService { 
            mLastInvalidCharger = mInvalidCharger;

            mLastBatteryCycleCount = mHealthInfo.batteryCycleCount;

            mLastCharingState = mHealthInfo.chargingState;

            mLastBatteryFullCharge = mHealthInfo.batteryFullChargeUah;

            mLastBatteryFullChargeDesign = mHealthInfo.batteryFullChargeDesignCapacityUah;

            mLastModLevel = mBatteryModProps.modLevel;

            mLastModStatus = mBatteryModProps.modStatus;

            mLastModFlag = mBatteryModProps.modFlag;
@@ -824,6 +831,10 @@ public final class BatteryService extends SystemService { 
        intent.putExtra(BatteryManager.EXTRA_CHARGE_COUNTER, mHealthInfo.batteryChargeCounterUah);

        intent.putExtra(BatteryManager.EXTRA_CYCLE_COUNT, mHealthInfo.batteryCycleCount);

        intent.putExtra(BatteryManager.EXTRA_CHARGING_STATUS, mHealthInfo.chargingState);

        intent.putExtra(BatteryManager.EXTRA_MAXIMUM_CAPACITY, mHealthInfo.batteryFullChargeUah);

        intent.putExtra(

                BatteryManager.EXTRA_DESIGN_CAPACITY,

                mHealthInfo.batteryFullChargeDesignCapacityUah);

        intent.putExtra(BatteryManager.EXTRA_MOD_LEVEL, mBatteryModProps.modLevel);

        intent.putExtra(BatteryManager.EXTRA_MOD_STATUS, mBatteryModProps.modStatus);

        intent.putExtra(BatteryManager.EXTRA_MOD_FLAG, mBatteryModProps.modFlag);
@@ -869,6 +880,10 @@ public final class BatteryService extends SystemService { 
        event.putLong(BatteryManager.EXTRA_EVENT_TIMESTAMP, now);

        event.putInt(BatteryManager.EXTRA_CYCLE_COUNT, mHealthInfo.batteryCycleCount);

        event.putInt(BatteryManager.EXTRA_CHARGING_STATUS, mHealthInfo.chargingState);

        event.putInt(BatteryManager.EXTRA_MAXIMUM_CAPACITY, mHealthInfo.batteryFullChargeUah);

        event.putInt(

                BatteryManager.EXTRA_DESIGN_CAPACITY,

                mHealthInfo.batteryFullChargeDesignCapacityUah);



        boolean queueWasEmpty = mBatteryLevelsEventQueue.isEmpty();

        mBatteryLevelsEventQueue.add(event);