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

Commit 98358899 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Null check when PowerStats HAL returns null instead of an empty array 

Bug: 331730483
Test: atest CtsOsTestCases
Change-Id: I1938b345ed87d18ed94709bb3c5a1ef6ce7aa8bb
parent eafebf01

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

+16 −14
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ public class PowerStatsService extends SystemService { 
            int index = 0;



            Channel[] channels = getEnergyMeterInfo();

            if (channels != null) {

                for (Channel channel : channels) {

                    PowerMonitor monitor = new PowerMonitor(index++,

                            PowerMonitor.POWER_MONITOR_TYPE_MEASUREMENT,
@@ -575,8 +576,9 @@ public class PowerStatsService extends SystemService { 
                    monitors.add(monitor);

                    states.add(new PowerMonitorState(monitor, channel.id));

                }



            }

            EnergyConsumer[] energyConsumers = getEnergyConsumerInfo();

            if (energyConsumers != null) {

                for (EnergyConsumer consumer : energyConsumers) {

                    PowerMonitor monitor = new PowerMonitor(index++,

                            PowerMonitor.POWER_MONITOR_TYPE_CONSUMER,
@@ -584,7 +586,7 @@ public class PowerStatsService extends SystemService { 
                    monitors.add(monitor);

                    states.add(new PowerMonitorState(monitor, consumer.id));

                }



            }

            mPowerMonitors = monitors.toArray(new PowerMonitor[monitors.size()]);

            mPowerMonitorStates = states.toArray(new PowerMonitorState[monitors.size()]);

        }