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

Commit 45f14f9c authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Prevent NPE when PowerStats Parcelable format changes 

Bug: 335475894
Test: atest PowerStatsTests
Change-Id: I2cb07f1ad592d37b30fe95e22b3bde52f069d516
parent 2a117e63

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 {