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

Commit 80bb0561 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 136109f1 b8d428e3

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