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

Merge "Save power component names in the summary parcel for MeasuredEnergySnapshot" into sc-dev

Browse Source
This commit is contained in:
Dmitri Plotnikov
2021-04-20 18:50:54 +00:00
committed by Android (Google) Code Review
parent 01991ab3f9 efa581e44e
commit 1eb043a982
5 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -161,7 +161,7 @@ public class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
static final int VERSION = 197;
static final int VERSION = 198;
// The maximum number of names wakelocks we will keep track of
// per uid; once the limit is reached, we batch the remaining wakelocks
@@ -15603,7 +15603,7 @@ public class BatteryStatsImpl extends BatteryStats {
out.writeLong(mNextMaxDailyDeadlineMs);
out.writeLong(mBatteryTimeToFullSeconds);
MeasuredEnergyStats.writeSummaryToParcel(mGlobalMeasuredEnergyStats, out, false);
MeasuredEnergyStats.writeSummaryToParcel(mGlobalMeasuredEnergyStats, out, false, false);
mScreenOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
mScreenDozeTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);
@@ -15928,7 +15928,7 @@ public class BatteryStatsImpl extends BatteryStats {
out.writeInt(0);
}
MeasuredEnergyStats.writeSummaryToParcel(u.mUidMeasuredEnergyStats, out, true);
MeasuredEnergyStats.writeSummaryToParcel(u.mUidMeasuredEnergyStats, out, true, true);
final ArrayMap<String, Uid.Wakelock> wakeStats = u.mWakelockStats.getMap();
int NW = wakeStats.size();

15
core/java/com/android/internal/power/MeasuredEnergyStats.java
View File

@@ -140,7 +140,7 @@ public class MeasuredEnergyStats {
*/
private MeasuredEnergyStats(int numIndices) {
mAccumulatedChargeMicroCoulomb = new long[numIndices];
mCustomBucketNames = new String[0];
mCustomBucketNames = new String[numIndices - NUMBER_STANDARD_POWER_BUCKETS];
}
/** Construct from parcel. */
@@ -290,7 +290,7 @@ public class MeasuredEnergyStats {
* Create a MeasuredEnergyStats object from a summary parcel.
*
* Corresponding write performed by
* {@link #writeSummaryToParcel(MeasuredEnergyStats, Parcel, boolean)}.
* {@link #writeSummaryToParcel(MeasuredEnergyStats, Parcel, boolean, boolean)}.
*
* @return a new MeasuredEnergyStats object as described.
* Returns null if the parcel indicates there is no data to populate.
@@ -300,9 +300,9 @@ public class MeasuredEnergyStats {
// Check if any MeasuredEnergyStats exists on the parcel
if (arraySize == 0) return null;
final int numCustomBuckets = arraySize - NUMBER_STANDARD_POWER_BUCKETS;
final String[] customBucketNames = in.readStringArray();
final MeasuredEnergyStats stats = new MeasuredEnergyStats(
new boolean[NUMBER_STANDARD_POWER_BUCKETS], new String[numCustomBuckets]);
new boolean[NUMBER_STANDARD_POWER_BUCKETS], customBucketNames);
stats.readSummaryFromParcel(in, true);
return stats;
}
@@ -315,7 +315,7 @@ public class MeasuredEnergyStats {
* possible (not necessarily supported) standard and custom buckets.
*
* Corresponding write performed by
* {@link #writeSummaryToParcel(MeasuredEnergyStats, Parcel, boolean)}.
* {@link #writeSummaryToParcel(MeasuredEnergyStats, Parcel, boolean, boolean)}.
*
* @return a new MeasuredEnergyStats object as described.
* Returns null if the stats contain no non-0 information (such as if template is null
@@ -370,12 +370,15 @@ public class MeasuredEnergyStats {
* and {@link #createAndReadSummaryFromParcel(Parcel, MeasuredEnergyStats)}.
*/
public static void writeSummaryToParcel(@Nullable MeasuredEnergyStats stats,
Parcel dest, boolean skipZero) {
Parcel dest, boolean skipZero, boolean skipCustomBucketNames) {
if (stats == null) {
dest.writeInt(0);
return;
}
dest.writeInt(stats.getNumberOfIndices());
if (!skipCustomBucketNames) {
dest.writeStringArray(stats.getCustomBucketNames());
}
stats.writeSummaryToParcel(dest, skipZero);
}

14
core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java
View File

@@ -159,7 +159,7 @@ public class MeasuredEnergyStatsTest {
stats.updateCustomBucket(1, 60);
final Parcel parcel = Parcel.obtain();
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false);
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false, false);
parcel.setDataPosition(0);
MeasuredEnergyStats newStats = MeasuredEnergyStats.createAndReadSummaryFromParcel(parcel);
@@ -175,6 +175,7 @@ public class MeasuredEnergyStatsTest {
}
assertEquals(POWER_DATA_UNAVAILABLE,
newStats.getAccumulatedCustomBucketCharge(customBucketNames.length + 1));
assertThat(newStats.getCustomBucketNames()).asList().containsExactly("A", "B");
parcel.recycle();
}
@@ -201,7 +202,7 @@ public class MeasuredEnergyStatsTest {
stats.updateCustomBucket(1, 316);
final Parcel parcel = Parcel.obtain();
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false);
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false, false);
final boolean[] newsupportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS];
newsupportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true;
@@ -234,6 +235,7 @@ public class MeasuredEnergyStatsTest {
}
assertEquals(POWER_DATA_UNAVAILABLE,
newStats.getAccumulatedCustomBucketCharge(customBucketNames.length + 1));
assertThat(newStats.getCustomBucketNames()).asList().containsExactly("A", "B");
parcel.recycle();
}
@@ -251,7 +253,7 @@ public class MeasuredEnergyStatsTest {
// Let's try parcelling with including zeros
final Parcel includeZerosParcel = Parcel.obtain();
MeasuredEnergyStats.writeSummaryToParcel(stats, includeZerosParcel, false);
MeasuredEnergyStats.writeSummaryToParcel(stats, includeZerosParcel, false, false);
includeZerosParcel.setDataPosition(0);
MeasuredEnergyStats newStats = MeasuredEnergyStats.createAndReadSummaryFromParcel(
@@ -275,7 +277,7 @@ public class MeasuredEnergyStatsTest {
// Now let's try parcelling with skipping zeros
final Parcel skipZerosParcel = Parcel.obtain();
MeasuredEnergyStats.writeSummaryToParcel(stats, skipZerosParcel, true);
MeasuredEnergyStats.writeSummaryToParcel(stats, skipZerosParcel, true, true);
skipZerosParcel.setDataPosition(0);
newStats = MeasuredEnergyStats.createAndReadSummaryFromParcel(skipZerosParcel);
@@ -315,7 +317,7 @@ public class MeasuredEnergyStatsTest {
stats.updateCustomBucket(1, 60);
final Parcel parcel = Parcel.obtain();
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false);
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false, false);
parcel.setDataPosition(0);
MeasuredEnergyStats newStats =
@@ -344,7 +346,7 @@ public class MeasuredEnergyStatsTest {
stats.updateStandardBucket(POWER_BUCKET_SCREEN_OTHER, 7L);
final Parcel parcel = Parcel.obtain();
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false);
MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false, false);
final boolean[] newSupportedStandardBuckets = new boolean[NUMBER_STANDARD_POWER_BUCKETS];
newSupportedStandardBuckets[POWER_BUCKET_SCREEN_ON] = true;

19
services/core/java/com/android/server/am/MeasuredEnergySnapshot.java
View File

@@ -345,12 +345,29 @@ public class MeasuredEnergySnapshot {
for (int idx = 0; idx < size; idx++) {
final EnergyConsumer consumer = mEnergyConsumers.valueAt(idx);
if (consumer.type == (int) EnergyConsumerType.OTHER) {
names[consumerIndex++] = consumer.name;
names[consumerIndex++] = sanitizeCustomBucketName(consumer.name);
}
}
return names;
}
private String sanitizeCustomBucketName(String bucketName) {
if (bucketName == null) {
return "";
}
StringBuilder sb = new StringBuilder(bucketName.length());
for (char c : bucketName.toCharArray()) {
if (Character.isWhitespace(c)) {
sb.append(' ');
} else if (Character.isISOControl(c)) {
sb.append('_');
} else {
sb.append(c);
}
}
return sb.toString();
}
/** Determines the number of ordinals for a given {@link EnergyConsumerType}. */
private static int calculateNumOrdinals(@EnergyConsumerType int type,
SparseArray<EnergyConsumer> idToConsumer) {

5
services/tests/servicestests/src/com/android/server/am/MeasuredEnergySnapshotTest.java
View File

@@ -52,7 +52,7 @@ public final class MeasuredEnergySnapshotTest {
private static final EnergyConsumer CONSUMER_OTHER_1 = createEnergyConsumer(
1, 1, EnergyConsumerType.OTHER, "HPU");
private static final EnergyConsumer CONSUMER_OTHER_2 = createEnergyConsumer(
436, 2, EnergyConsumerType.OTHER, "IPU");
436, 2, EnergyConsumerType.OTHER, "IPU\n&\005");
private static final SparseArray<EnergyConsumer> ALL_ID_CONSUMER_MAP = createIdToConsumerMap(
CONSUMER_DISPLAY, CONSUMER_OTHER_0, CONSUMER_OTHER_1, CONSUMER_OTHER_2);
@@ -228,7 +228,8 @@ public final class MeasuredEnergySnapshotTest {
@Test
public void testGetOtherOrdinalNames() {
final MeasuredEnergySnapshot snapshot = new MeasuredEnergySnapshot(ALL_ID_CONSUMER_MAP);
assertThat(snapshot.getOtherOrdinalNames()).asList().containsExactly("GPU", "HPU", "IPU");
assertThat(snapshot.getOtherOrdinalNames()).asList()
.containsExactly("GPU", "HPU", "IPU &_");
}
@Test