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

Commit 6c06d9a5 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Note BATTERY_LEVEL_CHANGED semantics." into tm-dev am: ce680c76 

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



Change-Id: Ife00e802d2b20b03c22c9c6669d081c38e8db639
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81250ce2 ce680c76

apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ public class InternalResourceService extends SystemService { 
            if (increased) {

                mAgent.distributeBasicIncomeLocked(newBatteryLevel);

            } else if (newBatteryLevel == mCurrentBatteryLevel) {

                Slog.wtf(TAG, "Battery level stayed the same");

                // The broadcast is also sent when the plug type changes...

                return;

            }

            mCurrentBatteryLevel = newBatteryLevel;

core/java/android/content/Intent.java

+1 −1
Original line number Diff line number Diff line
@@ -3259,7 +3259,7 @@ public class Intent implements Parcelable, Cloneable { 




    /**

     * Broadcast Action: Sent when the current battery level changes.

     * Broadcast Action: Sent when the current battery level or plug type changes.

     *

     * It has {@link android.os.BatteryManager#EXTRA_EVENTS} that carries a list of {@link Bundle}

     * instances representing individual battery level changes with associated