Merge "powerstats: Renamed energy meter api" into sc-dev (3d34f830) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();