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

Commit 9c797b5d authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE when PowerStats Parcelable format changes" into main

parents 444c2aa5 45f14f9c

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

+3 −1
Original line number Diff line number Diff line
@@ -259,8 +259,10 @@ public class BatteryStatsHistoryIterator implements Iterator<BatteryStats.Histor 
            final int extensionFlags = src.readInt();

            if ((extensionFlags & BatteryStatsHistory.EXTENSION_POWER_STATS_DESCRIPTOR_FLAG) != 0) {

                PowerStats.Descriptor descriptor = PowerStats.Descriptor.readSummaryFromParcel(src);

                if (descriptor != null) {

                    mDescriptorRegistry.register(descriptor);

                }

            }

            if ((extensionFlags & BatteryStatsHistory.EXTENSION_POWER_STATS_FLAG) != 0) {

                cur.powerStats = PowerStats.readFromParcel(src, mDescriptorRegistry);

            } else {