commit b8d428e31adebad59eda223f74475a0984bbb32e
author Mat Bevilacqua <matbev@google.com> Tue Jan 26 18:12:03 2021 -0800
committer Mat Bevilacqua <matbev@google.com> Wed Jan 27 15:38:52 2021 -0800
tree 72de4e040d4749b4f2ac085ad8ecfa3cddc0cf0e
parent 1ee021411844abc734ac51dbf88a16a20f0108a2

Return empty array rather than null

Be consistent with PowerStats HAL return values.

Bug: 178414923
Test: atest FrameworksServicesTests:PowerStatsServiceTest
Change-Id: I4aa8bf09779f2e0023b7ad76db6c8e66f16a1158

services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java

diff --git a/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java b/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java
index 3e39b4b..eb9df75 100644
--- a/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java
+++ b/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java
@@ -295,14 +295,14 @@
         @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