diff options
| author | 2021-04-14 19:10:36 +0000 | |
|---|---|---|
| committer | 2021-04-14 19:10:36 +0000 | |
| commit | 8017f4ed5e5806491b4a6e14422193ea2f588f21 (patch) | |
| tree | 61e5a95aa52a962d7e9a89df145e91fc76dd7d66 | |
| parent | 706bd974d1e61991deb75b3a5688e5b73429d153 (diff) | |
| parent | 153f2acfee7c9a51a231cae6120b01be15bc20dc (diff) | |
Merge "Fix NullPointerException in BatteryUsageStats" into sc-dev
| -rw-r--r-- | core/java/android/os/BatteryUsageStats.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/core/java/android/os/BatteryUsageStats.java b/core/java/android/os/BatteryUsageStats.java index 48f4ca4035ce..8ea59ce37018 100644 --- a/core/java/android/os/BatteryUsageStats.java +++ b/core/java/android/os/BatteryUsageStats.java @@ -24,7 +24,6 @@ import com.android.internal.os.BatteryStatsHistory; import com.android.internal.os.BatteryStatsHistoryIterator; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -233,8 +232,6 @@ public final class BatteryUsageStats implements Parcelable { mHistoryBuffer = null; mHistoryTagPool = null; } - System.out.println("From Parcel = " + Arrays.toString( - mCustomPowerComponentNames)); } @Override @@ -293,6 +290,7 @@ public final class BatteryUsageStats implements Parcelable { * Builder for BatteryUsageStats. */ public static final class Builder { + @NonNull private final String[] mCustomPowerComponentNames; private final int mCustomTimeComponentCount; private final boolean mIncludePowerModels; @@ -311,11 +309,11 @@ public final class BatteryUsageStats implements Parcelable { private Parcel mHistoryBuffer; private List<BatteryStats.HistoryTag> mHistoryTagPool; - public Builder(String[] customPowerComponentNames, int customTimeComponentCount) { + public Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount) { this(customPowerComponentNames, customTimeComponentCount, false); } - public Builder(String[] customPowerComponentNames, int customTimeComponentCount, + public Builder(@NonNull String[] customPowerComponentNames, int customTimeComponentCount, boolean includePowerModels) { mCustomPowerComponentNames = customPowerComponentNames; mCustomTimeComponentCount = customTimeComponentCount; diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index e83f365738da..cb1900f300c0 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -6951,9 +6951,9 @@ public class BatteryStatsImpl extends BatteryStats { /** * Returns the names of custom power components. */ - public @Nullable String[] getCustomPowerComponentNames() { + public @NonNull String[] getCustomPowerComponentNames() { if (mGlobalMeasuredEnergyStats == null) { - return null; + return new String[0]; } final String[] names = mGlobalMeasuredEnergyStats.getCustomBucketNames(); for (int i = 0; i < names.length; i++) { |