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 am: 80bb0561bf am: f8e1adda39

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13421016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id48bd0a0300b293fc7fddb3e62db055c8253de50
This commit is contained in:
TreeHugger Robot
2021-01-29 20:58:55 +00:00
committed by Automerger Merge Worker
parent 4b1124089a f8e1adda39
commit fa7eac61ca
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
public android.hardware.power.stats.EnergyConsumer[] getEnergyConsumerInfo() {
if (DEBUG) Slog.d(TAG, "Energy consumer info is not supported");
return null;
return new android.hardware.power.stats.EnergyConsumer[0];
}
@Override
public android.hardware.power.stats.EnergyConsumerResult[] getEnergyConsumed(
int[] energyConsumerIds) {
if (DEBUG) Slog.d(TAG, "Energy consumer results are not supported");
return null;
return new android.hardware.power.stats.EnergyConsumerResult[0];
}
@Override