diff options
5 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java b/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java index eb9df756dd0e..9a91848475fe 100644 --- a/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java +++ b/services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java @@ -120,7 +120,7 @@ public final class PowerStatsHALWrapper { * @return List of EnergyMeasurement objects containing energy measurements for all * available energy meters. */ - android.hardware.power.stats.EnergyMeasurement[] readEnergyMeters(int[] channelIds); + android.hardware.power.stats.EnergyMeasurement[] readEnergyMeter(int[] channelIds); /** * Returns boolean indicating if connection to power stats HAL was established. @@ -235,13 +235,13 @@ public final class PowerStatsHALWrapper { } @Override - public android.hardware.power.stats.EnergyMeasurement[] readEnergyMeters(int[] channelIds) { + public android.hardware.power.stats.EnergyMeasurement[] readEnergyMeter(int[] channelIds) { android.hardware.power.stats.EnergyMeasurement[] energyMeasurementHAL = null; if (sVintfPowerStats != null) { try { energyMeasurementHAL = - sVintfPowerStats.get().readEnergyMeters(channelIds); + sVintfPowerStats.get().readEnergyMeter(channelIds); } catch (RemoteException e) { if (DEBUG) Slog.d(TAG, "Failed to get energy measurements from PowerStats HAL"); } @@ -311,7 +311,7 @@ public final class PowerStatsHALWrapper { } @Override - public android.hardware.power.stats.EnergyMeasurement[] readEnergyMeters(int[] channelIds) { + public android.hardware.power.stats.EnergyMeasurement[] readEnergyMeter(int[] channelIds) { return nativeReadEnergyMeters(channelIds); } diff --git a/services/core/java/com/android/server/powerstats/PowerStatsLogger.java b/services/core/java/com/android/server/powerstats/PowerStatsLogger.java index 78a227ee170e..e117b0c835bf 100644 --- a/services/core/java/com/android/server/powerstats/PowerStatsLogger.java +++ b/services/core/java/com/android/server/powerstats/PowerStatsLogger.java @@ -69,7 +69,7 @@ public final class PowerStatsLogger extends Handler { // Log power meter data. EnergyMeasurement[] energyMeasurements = - mPowerStatsHALWrapper.readEnergyMeters(new int[0]); + mPowerStatsHALWrapper.readEnergyMeter(new int[0]); mPowerStatsMeterStorage.write( EnergyMeasurementUtils.getProtoBytes(energyMeasurements)); if (DEBUG) EnergyMeasurementUtils.print(energyMeasurements); diff --git a/services/core/java/com/android/server/powerstats/PowerStatsService.java b/services/core/java/com/android/server/powerstats/PowerStatsService.java index be5c2e133486..ea41980c02b1 100644 --- a/services/core/java/com/android/server/powerstats/PowerStatsService.java +++ b/services/core/java/com/android/server/powerstats/PowerStatsService.java @@ -291,6 +291,6 @@ public class PowerStatsService extends SystemService { private void readEnergyMeterAsync(CompletableFuture<EnergyMeasurement[]> future, int[] channelIds) { - future.complete(getPowerStatsHal().readEnergyMeters(channelIds)); + future.complete(getPowerStatsHal().readEnergyMeter(channelIds)); } } diff --git a/services/core/java/com/android/server/powerstats/StatsPullAtomCallbackImpl.java b/services/core/java/com/android/server/powerstats/StatsPullAtomCallbackImpl.java index f8b9601bfd62..7c6999acc666 100644 --- a/services/core/java/com/android/server/powerstats/StatsPullAtomCallbackImpl.java +++ b/services/core/java/com/android/server/powerstats/StatsPullAtomCallbackImpl.java @@ -70,7 +70,7 @@ public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCall } private int pullOnDevicePowerMeasurement(int atomTag, List<StatsEvent> events) { - EnergyMeasurement[] energyMeasurements = mPowerStatsHALWrapper.readEnergyMeters(new int[0]); + EnergyMeasurement[] energyMeasurements = mPowerStatsHALWrapper.readEnergyMeter(new int[0]); if (energyMeasurements == null) { return StatsManager.PULL_SKIP; } diff --git a/services/tests/servicestests/src/com/android/server/powerstats/PowerStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/powerstats/PowerStatsServiceTest.java index 84b690f01b02..53ddb288b4e7 100644 --- a/services/tests/servicestests/src/com/android/server/powerstats/PowerStatsServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/powerstats/PowerStatsServiceTest.java @@ -221,7 +221,7 @@ public class PowerStatsServiceTest { } @Override - public EnergyMeasurement[] readEnergyMeters(int[] channelIds) { + public EnergyMeasurement[] readEnergyMeter(int[] channelIds) { EnergyMeasurement[] energyMeasurementList = new EnergyMeasurement[ENERGY_METER_COUNT]; for (int i = 0; i < energyMeasurementList.length; i++) { energyMeasurementList[i] = new EnergyMeasurement(); |