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

Commit 32768fd6 authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Merge "BatteryStats custom buckets: don't revive dead Uids" into sc-dev am: 0b905b1e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a8954b852f26216bab3bdb21ab44d4e3168c5d4
parents c23d4830 0b905b1e

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

+15 −4
Original line number Diff line number Diff line
@@ -12520,6 +12520,7 @@ public class BatteryStatsImpl extends BatteryStats { 
     * @param totalEnergyUJ energy (microjoules) used for this bucket since this was last called.

     * @param uidEnergies map of uid->energy (microjoules) for this bucket since last called.

     *                    Data inside uidEnergies will not be modified (treated immutable).

     *                    Uids not already known to BatteryStats will be ignored.

     */

    public void updateCustomMeasuredEnergyDataLocked(int customEnergyBucket,

            long totalEnergyUJ, @Nullable SparseLongArray uidEnergies) {
@@ -12540,10 +12541,20 @@ public class BatteryStatsImpl extends BatteryStats { 
            final int uidInt = mapUid(uidEnergies.keyAt(i));

            final long uidEnergyUJ = uidEnergies.valueAt(i);

            if (uidEnergyUJ == 0) continue;

            // TODO(b/180030409): Worry about dead Uids (no longer in BSI) being revived by this,

            //  or converse problem of not creating a new Uid if its first blame is recorded here.

            final Uid uidObj = getUidStatsLocked(uidInt);

            final Uid uidObj = getAvailableUidStatsLocked(uidInt);

            if (uidObj != null) {

                uidObj.addEnergyToCustomBucketLocked(uidEnergyUJ, customEnergyBucket, true);

            } else {

                // Ignore any uid not already known to BatteryStats, rather than creating a new Uid.

                // Otherwise we could end up reviving dead Uids. Note that the CPU data is updated

                // first, so any uid that has used any CPU should already be known to BatteryStats.

                // Recently removed uids (especially common for isolated uids) can reach this path

                // and are ignored.

                if (!Process.isIsolated(uidInt)) {

                    Slog.w(TAG, "Received measured energy " + totalEnergyUJ + " for custom bucket "

                        + customEnergyBucket + " for non-existent uid " + uidInt);

                }

            }

        }

    }