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

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

Merge "Fix NPE in `dumpsys batterystats`" into main

parents 4dadb089 4dc07472

services/core/java/com/android/server/am/BatteryStatsService.java

+2 −2
Original line number Diff line number Diff line
@@ -3013,7 +3013,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                                        mBatteryStatsConfig, Clock.SYSTEM_CLOCK, mMonotonicClock,

                                        null, mStats.mHandler, null, null,

                                        mUserManagerUserInfoProvider, mPowerProfile,

                                        mCpuScalingPolicies, null);

                                        mCpuScalingPolicies, new PowerStatsUidResolver());

                                checkinStats.readSummaryFromParcel(in);

                                in.recycle();

                                checkinStats.dumpProtoLocked(mContext, fd, apps, flags,
@@ -3055,7 +3055,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                                        mBatteryStatsConfig, Clock.SYSTEM_CLOCK, mMonotonicClock,

                                        null, mStats.mHandler, null, null,

                                        mUserManagerUserInfoProvider, mPowerProfile,

                                        mCpuScalingPolicies, null);

                                        mCpuScalingPolicies, new PowerStatsUidResolver());

                                checkinStats.readSummaryFromParcel(in);

                                in.recycle();

                                checkinStats.dumpCheckin(mContext, pw, apps, flags,