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

Commit f8e1adda authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Return empty array rather than null" into sc-dev am: 80bb0561 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I902aafcaa91d3b48faa490f99b0f01a35203eb96
parents 986799af 80bb0561

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

+2 −2
Original line number Diff line number Diff line
@@ -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