Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "powerstats: Renamed energy meter api" into sc-dev

Browse Source
This commit is contained in:
Benjamin Schwartz
2021-02-04 20:45:16 +00:00
committed by Android (Google) Code Review
parent 4f574f1422 1a666b9470
commit 3d34f830cb
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/powerstats/PowerStatsHALWrapper.java
View File

@@ -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);
}

2
services/core/java/com/android/server/powerstats/PowerStatsLogger.java
View File

@@ -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);

2
services/core/java/com/android/server/powerstats/PowerStatsService.java
View File

@@ -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));
}
}

2
services/core/java/com/android/server/powerstats/StatsPullAtomCallbackImpl.java
View File

@@ -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;
}

2
services/tests/servicestests/src/com/android/server/powerstats/PowerStatsServiceTest.java
View File

@@ -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();