Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return empty array rather than null" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-28 23:15:56 +00:00
committed by Android (Google) Code Review
parent 136109f1cf b8d428e31a
commit 80bb0561bf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java
View File

@@ -295,14 +295,14 @@ public final class PowerStatsHALWrapper {
@Override @Override
public android.hardware.power.stats.EnergyConsumer[] getEnergyConsumerInfo() { public android.hardware.power.stats.EnergyConsumer[] getEnergyConsumerInfo() {
if (DEBUG) Slog.d(TAG, "Energy consumer info is not supported"); if (DEBUG) Slog.d(TAG, "Energy consumer info is not supported");
return null; return new android.hardware.power.stats.EnergyConsumer[0];
} }
@Override @Override
public android.hardware.power.stats.EnergyConsumerResult[] getEnergyConsumed( public android.hardware.power.stats.EnergyConsumerResult[] getEnergyConsumed(
int[] energyConsumerIds) { int[] energyConsumerIds) {
if (DEBUG) Slog.d(TAG, "Energy consumer results are not supported"); if (DEBUG) Slog.d(TAG, "Energy consumer results are not supported");
return null; return new android.hardware.power.stats.EnergyConsumerResult[0];
} }
@Override @Override