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

Commit 895d47fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BatteryService: Typo fix ("Charing" -> "Charging")" into main am: c33762ca am: f0eed743 

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



Change-Id: Ic10ba69445d2f4302c82f57a2d5d11a1b60cd960
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f930a4f7 f0eed743

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

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public final class BatteryService extends SystemService { 
    private int mLastMaxChargingVoltage;

    private int mLastChargeCounter;

    private int mLastBatteryCycleCount;

    private int mLastCharingState;

    private int mLastChargingState;

    /**

     * The last seen charging policy. This requires the

     * {@link android.Manifest.permission#BATTERY_STATS} permission and should therefore not be
@@ -555,7 +555,7 @@ public final class BatteryService extends SystemService { 
                        || mHealthInfo.batteryChargeCounterUah != mLastChargeCounter

                        || mInvalidCharger != mLastInvalidCharger

                        || mHealthInfo.batteryCycleCount != mLastBatteryCycleCount

                        || mHealthInfo.chargingState != mLastCharingState)) {

                        || mHealthInfo.chargingState != mLastChargingState)) {



            if (mPlugType != mLastPlugType) {

                if (mLastPlugType == BATTERY_PLUGGED_NONE) {
@@ -738,7 +738,7 @@ public final class BatteryService extends SystemService { 
            mLastBatteryLevelCritical = mBatteryLevelCritical;

            mLastInvalidCharger = mInvalidCharger;

            mLastBatteryCycleCount = mHealthInfo.batteryCycleCount;

            mLastCharingState = mHealthInfo.chargingState;

            mLastChargingState = mHealthInfo.chargingState;

        }

    }