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

Commit e18ba380 authored by Jack Wu's avatar Jack Wu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "batteryStateOfHealth" am: 9614aa9c am: c3563cca... 

Merge changes from topic "batteryStateOfHealth" am: 9614aa9c am: c3563cca am: aacb1b9d am: fcc74c31

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2442659



Change-Id: Ia367e841bfe1f8da3077e057cb27b7130a5af637
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 120507c9 fcc74c31

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -32412,7 +32412,6 @@ package android.os { 
    field public static final String EXTRA_PLUGGED = "plugged";

    field public static final String EXTRA_PRESENT = "present";

    field public static final String EXTRA_SCALE = "scale";

    field public static final String EXTRA_STATE_OF_HEALTH = "android.os.extra.STATE_OF_HEALTH";

    field public static final String EXTRA_STATUS = "status";

    field public static final String EXTRA_TECHNOLOGY = "technology";

    field public static final String EXTRA_TEMPERATURE = "temperature";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10210,6 +10210,7 @@ package android.os { 
    field @RequiresPermission(android.Manifest.permission.BATTERY_STATS) public static final int BATTERY_PROPERTY_CHARGING_POLICY = 9; // 0x9

    field @RequiresPermission(android.Manifest.permission.BATTERY_STATS) public static final int BATTERY_PROPERTY_FIRST_USAGE_DATE = 8; // 0x8

    field @RequiresPermission(android.Manifest.permission.BATTERY_STATS) public static final int BATTERY_PROPERTY_MANUFACTURING_DATE = 7; // 0x7

    field @RequiresPermission(android.Manifest.permission.BATTERY_STATS) public static final int BATTERY_PROPERTY_STATE_OF_HEALTH = 10; // 0xa

    field public static final int CHARGING_POLICY_ADAPTIVE_AC = 3; // 0x3

    field public static final int CHARGING_POLICY_ADAPTIVE_AON = 2; // 0x2

    field public static final int CHARGING_POLICY_ADAPTIVE_LONGLIFE = 4; // 0x4

core/java/android/os/BatteryManager.java

+14 −7
Original line number Diff line number Diff line
@@ -152,13 +152,6 @@ public class BatteryManager { 
     */

    public static final String EXTRA_CYCLE_COUNT = "android.os.extra.CYCLE_COUNT";



    /**

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

     * Int value representing the measured battery state of health (remaining

     * estimate full charge capacity relative to the rated capacity in %).

     */

    public static final String EXTRA_STATE_OF_HEALTH = "android.os.extra.STATE_OF_HEALTH";



    /**

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

     * Int value representing the battery charging status.
@@ -358,6 +351,20 @@ public class BatteryManager { 
    @SystemApi

    public static final int BATTERY_PROPERTY_CHARGING_POLICY = 9;



    /**

     *

     * Percentage representing the measured battery state of health (remaining

     * estimated full charge capacity relative to the rated capacity in %).

     *

     * <p class="note">

     * The sender must hold the {@link android.Manifest.permission#BATTERY_STATS} permission.

     *

     * @hide

     */

    @RequiresPermission(permission.BATTERY_STATS)

    @SystemApi

    public static final int BATTERY_PROPERTY_STATE_OF_HEALTH = 10;



    private final Context mContext;

    private final IBatteryStats mBatteryStats;

    private final IBatteryPropertiesRegistrar mBatteryPropertiesRegistrar;

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

+1 −5
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ public final class BatteryService extends SystemService { 
    private int mLastMaxChargingVoltage;

    private int mLastChargeCounter;

    private int mLastBatteryCycleCount;

    private int mLastBatteryStateOfHealth;

    private int mLastCharingState;



    private int mSequence = 1;
@@ -528,7 +527,6 @@ public final class BatteryService extends SystemService { 
                        || mHealthInfo.batteryChargeCounterUah != mLastChargeCounter

                        || mInvalidCharger != mLastInvalidCharger

                        || mHealthInfo.batteryCycleCount != mLastBatteryCycleCount

                        || mHealthInfo.batteryStateOfHealth != mLastBatteryStateOfHealth

                        || mHealthInfo.chargingState != mLastCharingState)) {



            if (mPlugType != mLastPlugType) {
@@ -712,7 +710,6 @@ public final class BatteryService extends SystemService { 
            mLastBatteryLevelCritical = mBatteryLevelCritical;

            mLastInvalidCharger = mInvalidCharger;

            mLastBatteryCycleCount = mHealthInfo.batteryCycleCount;

            mLastBatteryStateOfHealth = mHealthInfo.batteryStateOfHealth;

            mLastCharingState = mHealthInfo.chargingState;

        }

    }
@@ -746,7 +743,6 @@ public final class BatteryService extends SystemService { 
                mHealthInfo.maxChargingVoltageMicrovolts);

        intent.putExtra(BatteryManager.EXTRA_CHARGE_COUNTER, mHealthInfo.batteryChargeCounterUah);

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

        intent.putExtra(BatteryManager.EXTRA_STATE_OF_HEALTH, mHealthInfo.batteryStateOfHealth);

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

        if (DEBUG) {

            Slog.d(TAG, "Sending ACTION_BATTERY_CHANGED. scale:" + BATTERY_SCALE
@@ -773,7 +769,6 @@ public final class BatteryService extends SystemService { 
        event.putInt(BatteryManager.EXTRA_CHARGE_COUNTER, mHealthInfo.batteryChargeCounterUah);

        event.putLong(BatteryManager.EXTRA_EVENT_TIMESTAMP, now);

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

        event.putInt(BatteryManager.EXTRA_STATE_OF_HEALTH, mHealthInfo.batteryStateOfHealth);

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



        boolean queueWasEmpty = mBatteryLevelsEventQueue.isEmpty();
@@ -1302,6 +1297,7 @@ public final class BatteryService extends SystemService { 
                case BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE:

                case BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE:

                case BatteryManager.BATTERY_PROPERTY_CHARGING_POLICY:

                case BatteryManager.BATTERY_PROPERTY_STATE_OF_HEALTH:

                    mContext.enforceCallingPermission(

                            android.Manifest.permission.BATTERY_STATS, null);

                    break;

services/core/java/com/android/server/health/HealthServiceWrapperAidl.java

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,10 @@ class HealthServiceWrapperAidl extends HealthServiceWrapper { 
                case BatteryManager.BATTERY_PROPERTY_CHARGING_POLICY:

                    prop.setLong(service.getChargingPolicy());

                    break;

                case BatteryManager.BATTERY_PROPERTY_STATE_OF_HEALTH:

                    healthData = service.getBatteryHealthData();

                    prop.setLong(healthData.batteryStateOfHealth);

                    break;

            }

        } catch (UnsupportedOperationException e) {

            // Leave prop untouched.