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

Merge "powerstats: Clients of PowerStatsInternal must nullcheck" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-22 03:49:19 +00:00
committed by Android (Google) Code Review
parent 0b4057f0a1 ba87437a7d
commit ddfb6c46f2
5 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/android/power/PowerStatsInternal.java
View File

@@ -50,7 +50,8 @@ public abstract class PowerStatsInternal {
* requested. * requested.
* *
* @return A Future containing a list of {@link EnergyConsumerResult} objects containing energy * @return A Future containing a list of {@link EnergyConsumerResult} objects containing energy
* consumer results for all listed {@link EnergyConsumerId}. * consumer results for all listed {@link EnergyConsumerId}. null if
* {@link EnergyConsumer} not supported
*/ */
@NonNull @NonNull
public abstract CompletableFuture<EnergyConsumerResult[]> getEnergyConsumedAsync( public abstract CompletableFuture<EnergyConsumerResult[]> getEnergyConsumedAsync(
@@ -59,8 +60,10 @@ public abstract class PowerStatsInternal {
/** /**
* Returns the power entity info for all available {@link PowerEntity} * Returns the power entity info for all available {@link PowerEntity}
* *
* @return List of available {@link PowerEntity} * @return List of available {@link PowerEntity} or null if {@link PowerEntity} not
* supported
*/ */
@Nullable
public abstract PowerEntity[] getPowerEntityInfo(); public abstract PowerEntity[] getPowerEntityInfo();
/** /**
@@ -71,7 +74,8 @@ public abstract class PowerStatsInternal {
* requested. * requested.
* *
* @return A Future containing a list of {@link StateResidencyResult} objects containing state * @return A Future containing a list of {@link StateResidencyResult} objects containing state
* residency results for all listed {@link PowerEntity.id}. * residency results for all listed {@link PowerEntity.id}. null if {@link PowerEntity}
* not supported
*/ */
@NonNull @NonNull
public abstract CompletableFuture<StateResidencyResult[]> getStateResidencyAsync( public abstract CompletableFuture<StateResidencyResult[]> getStateResidencyAsync(
@@ -80,8 +84,9 @@ public abstract class PowerStatsInternal {
/** /**
* Returns the channel info for all available {@link Channel} * Returns the channel info for all available {@link Channel}
* *
* @return List of available {@link Channel} * @return List of available {@link Channel} or null if {@link Channel} not supported
*/ */
@Nullable
public abstract Channel[] getEnergyMeterInfo(); public abstract Channel[] getEnergyMeterInfo();
/** /**
@@ -91,7 +96,8 @@ public abstract class PowerStatsInternal {
* @param channelIds Array of {@link Channel.id} for accumulated energy is being requested. * @param channelIds Array of {@link Channel.id} for accumulated energy is being requested.
* *
* @return A Future containing a list of {@link EnergyMeasurement} objects containing * @return A Future containing a list of {@link EnergyMeasurement} objects containing
* accumulated energy measurements for all listed {@link Channel.id}. * accumulated energy measurements for all listed {@link Channel.id}. null if
* {@link Channel} not supported
*/ */
@NonNull @NonNull
public abstract CompletableFuture<EnergyMeasurement[]> readEnergyMeterAsync( public abstract CompletableFuture<EnergyMeasurement[]> readEnergyMeterAsync(

4
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -216,6 +216,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub
return; return;
} }
if (results == null) return;
for (int i = 0; i < results.length; i++) { for (int i = 0; i < results.length; i++) {
final StateResidencyResult result = results[i]; final StateResidencyResult result = results[i];
RpmStats.PowerStateSubsystem subsystem = RpmStats.PowerStateSubsystem subsystem =
@@ -257,7 +259,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
return EMPTY; return EMPTY;
} }
if (results.length == 0) return EMPTY; if (results == null || results.length == 0) return EMPTY;
int charsLeft = MAX_LOW_POWER_STATS_SIZE; int charsLeft = MAX_LOW_POWER_STATS_SIZE;
StringBuilder builder = new StringBuilder("SubsystemPowerState"); StringBuilder builder = new StringBuilder("SubsystemPowerState");

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

@@ -16,6 +16,7 @@
package com.android.server.powerstats; package com.android.server.powerstats;
import android.annotation.Nullable;
import android.hardware.power.stats.Channel; import android.hardware.power.stats.Channel;
import android.hardware.power.stats.EnergyMeasurement; import android.hardware.power.stats.EnergyMeasurement;
import android.hardware.power.stats.IPowerStats; import android.hardware.power.stats.IPowerStats;
@@ -51,6 +52,7 @@ public final class PowerStatsHALWrapper {
* *
* @return List of information on each PowerEntity. * @return List of information on each PowerEntity.
*/ */
@Nullable
android.hardware.power.stats.PowerEntity[] getPowerEntityInfo(); android.hardware.power.stats.PowerEntity[] getPowerEntityInfo();
/** /**
@@ -70,6 +72,7 @@ public final class PowerStatsHALWrapper {
* *
* @return StateResidency since boot for each requested PowerEntity * @return StateResidency since boot for each requested PowerEntity
*/ */
@Nullable
android.hardware.power.stats.StateResidencyResult[] getStateResidency(int[] powerEntityIds); android.hardware.power.stats.StateResidencyResult[] getStateResidency(int[] powerEntityIds);
/** /**
@@ -81,6 +84,7 @@ public final class PowerStatsHALWrapper {
* *
* @return List of EnergyConsumers all available energy consumers. * @return List of EnergyConsumers all available energy consumers.
*/ */
@Nullable
android.hardware.power.stats.EnergyConsumer[] getEnergyConsumerInfo(); android.hardware.power.stats.EnergyConsumer[] getEnergyConsumerInfo();
/** /**
@@ -96,6 +100,7 @@ public final class PowerStatsHALWrapper {
* @return List of EnergyConsumerResult objects containing energy consumer results for all * @return List of EnergyConsumerResult objects containing energy consumer results for all
* available energy consumers (power models). * available energy consumers (power models).
*/ */
@Nullable
android.hardware.power.stats.EnergyConsumerResult[] getEnergyConsumed( android.hardware.power.stats.EnergyConsumerResult[] getEnergyConsumed(
int[] energyConsumerIds); int[] energyConsumerIds);
@@ -105,6 +110,7 @@ public final class PowerStatsHALWrapper {
* @return List of Channel objects containing channel info for all available energy * @return List of Channel objects containing channel info for all available energy
* meters. * meters.
*/ */
@Nullable
android.hardware.power.stats.Channel[] getEnergyMeterInfo(); android.hardware.power.stats.Channel[] getEnergyMeterInfo();
/** /**
@@ -120,6 +126,7 @@ public final class PowerStatsHALWrapper {
* @return List of EnergyMeasurement objects containing energy measurements for all * @return List of EnergyMeasurement objects containing energy measurements for all
* available energy meters. * available energy meters.
*/ */
@Nullable
android.hardware.power.stats.EnergyMeasurement[] readEnergyMeter(int[] channelIds); android.hardware.power.stats.EnergyMeasurement[] readEnergyMeter(int[] channelIds);
/** /**

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

@@ -87,6 +87,8 @@ public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCall
return StatsManager.PULL_SKIP; return StatsManager.PULL_SKIP;
} }
if (energyMeasurements == null) return StatsManager.PULL_SKIP;
for (int i = 0; i < energyMeasurements.length; i++) { for (int i = 0; i < energyMeasurements.length; i++) {
// Only report energy measurements that have been accumulated since boot // Only report energy measurements that have been accumulated since boot
final EnergyMeasurement energyMeasurement = energyMeasurements[i]; final EnergyMeasurement energyMeasurement = energyMeasurements[i];
@@ -135,6 +137,8 @@ public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCall
return StatsManager.PULL_SKIP; return StatsManager.PULL_SKIP;
} }
if (results == null) return StatsManager.PULL_SKIP;
for (int i = 0; i < results.length; i++) { for (int i = 0; i < results.length; i++) {
final StateResidencyResult result = results[i]; final StateResidencyResult result = results[i];
for (int j = 0; j < result.stateResidencyData.length; j++) { for (int j = 0; j < result.stateResidencyData.length; j++) {

100
services/core/jni/com_android_server_powerstats_PowerStatsService.cpp
View File

@@ -217,41 +217,30 @@ static jobjectArray nativeGetStateResidency(JNIEnv *env, jclass clazz, jintArray
jobjectArray stateResidencyResultArray = nullptr; jobjectArray stateResidencyResultArray = nullptr;
Return<void> ret = gPowerStatsHalV1_0_ptr->getPowerEntityStateResidencyData( Return<void> ret = gPowerStatsHalV1_0_ptr->getPowerEntityStateResidencyData(
powerEntityIdVector, [&env, &stateResidencyResultArray](auto results, auto status) { powerEntityIdVector, [&env, &stateResidencyResultArray](auto results, auto status) {
if (status != Status::SUCCESS) { stateResidencyResultArray = env->NewObjectArray(results.size(), class_SRR, nullptr);
ALOGE("Error getting power entity state residency data"); for (int i = 0; i < results.size(); i++) {
} else { jobjectArray stateResidencyArray =
stateResidencyResultArray = env->NewObjectArray(results[i].stateResidencyData.size(), class_SR,
env->NewObjectArray(results.size(), class_SRR, nullptr); nullptr);
for (int i = 0; i < results.size(); i++) { for (int j = 0; j < results[i].stateResidencyData.size(); j++) {
jobjectArray stateResidencyArray = jobject stateResidency = env->NewObject(class_SR, method_SR_init);
env->NewObjectArray(results[i].stateResidencyData.size(), class_SR, env->SetIntField(stateResidency, field_SR_id,
nullptr); results[i].stateResidencyData[j].powerEntityStateId);
for (int j = 0; j < results[i].stateResidencyData.size(); j++) { env->SetLongField(stateResidency, field_SR_totalTimeInStateMs,
jobject stateResidency = env->NewObject(class_SR, method_SR_init); results[i].stateResidencyData[j].totalTimeInStateMs);
env->SetIntField(stateResidency, field_SR_id, env->SetLongField(stateResidency, field_SR_totalStateEntryCount,
results[i].stateResidencyData[j].powerEntityStateId); results[i].stateResidencyData[j].totalStateEntryCount);
env->SetLongField(stateResidency, field_SR_totalTimeInStateMs, env->SetLongField(stateResidency, field_SR_lastEntryTimestampMs,
results[i].stateResidencyData[j].totalTimeInStateMs); results[i].stateResidencyData[j].lastEntryTimestampMs);
env->SetLongField(stateResidency, field_SR_totalStateEntryCount, env->SetObjectArrayElement(stateResidencyArray, j, stateResidency);
results[i] env->DeleteLocalRef(stateResidency);
.stateResidencyData[j]
.totalStateEntryCount);
env->SetLongField(stateResidency, field_SR_lastEntryTimestampMs,
results[i]
.stateResidencyData[j]
.lastEntryTimestampMs);
env->SetObjectArrayElement(stateResidencyArray, j, stateResidency);
env->DeleteLocalRef(stateResidency);
}
jobject stateResidencyResult = env->NewObject(class_SRR, method_SRR_init);
env->SetIntField(stateResidencyResult, field_SRR_id,
results[i].powerEntityId);
env->SetObjectField(stateResidencyResult, field_SRR_stateResidencyData,
stateResidencyArray);
env->SetObjectArrayElement(stateResidencyResultArray, i,
stateResidencyResult);
env->DeleteLocalRef(stateResidencyResult);
} }
jobject stateResidencyResult = env->NewObject(class_SRR, method_SRR_init);
env->SetIntField(stateResidencyResult, field_SRR_id, results[i].powerEntityId);
env->SetObjectField(stateResidencyResult, field_SRR_stateResidencyData,
stateResidencyArray);
env->SetObjectArrayElement(stateResidencyResultArray, i, stateResidencyResult);
env->DeleteLocalRef(stateResidencyResult);
} }
}); });
if (!checkResult(ret, __func__)) { if (!checkResult(ret, __func__)) {
@@ -320,30 +309,25 @@ static jobjectArray nativeReadEnergyMeters(JNIEnv *env, jclass clazz, jintArray
gPowerStatsHalV1_0_ptr gPowerStatsHalV1_0_ptr
->getEnergyData(channelIdVector, ->getEnergyData(channelIdVector,
[&env, &energyMeasurementArray](auto energyData, auto status) { [&env, &energyMeasurementArray](auto energyData, auto status) {
if (status != Status::SUCCESS) { energyMeasurementArray =
ALOGW("Error getting energy data"); env->NewObjectArray(energyData.size(), class_EM,
} else { nullptr);
energyMeasurementArray = for (int i = 0; i < energyData.size(); i++) {
env->NewObjectArray(energyData.size(), class_EM, jobject energyMeasurement =
nullptr); env->NewObject(class_EM, method_EM_init);
for (int i = 0; i < energyData.size(); i++) { env->SetIntField(energyMeasurement, field_EM_id,
jobject energyMeasurement = energyData[i].index);
env->NewObject(class_EM, method_EM_init); env->SetLongField(energyMeasurement,
env->SetIntField(energyMeasurement, field_EM_id, field_EM_timestampMs,
energyData[i].index); energyData[i].timestamp);
env->SetLongField(energyMeasurement, env->SetLongField(energyMeasurement,
field_EM_timestampMs, field_EM_durationMs,
energyData[i].timestamp); energyData[i].timestamp);
env->SetLongField(energyMeasurement, env->SetLongField(energyMeasurement, field_EM_energyUWs,
field_EM_durationMs, energyData[i].energy);
energyData[i].timestamp); env->SetObjectArrayElement(energyMeasurementArray, i,
env->SetLongField(energyMeasurement, energyMeasurement);
field_EM_energyUWs, env->DeleteLocalRef(energyMeasurement);
energyData[i].energy);
env->SetObjectArrayElement(energyMeasurementArray,
i, energyMeasurement);
env->DeleteLocalRef(energyMeasurement);
}
} }
}); });