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

Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev

Browse Source 
am: aff7c3c71e

Change-Id: Ie7691a19ef61668afd9200c9a3c77fa9fc5368f1
This commit is contained in:
Sudheer Shanka
2017-05-18 17:53:28 +00:00
committed by android-build-merger
parent 4d208f2ec6 aff7c3c71e
commit 1768a0054d
3 changed files with 341 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,14 +967,15 @@ public class BatteryStatsImpl extends BatteryStats {
}
}
@VisibleForTesting
public static class LongSamplingCounterArray extends LongCounterArray implements TimeBaseObs {
final TimeBase mTimeBase;
long[] mCounts;
long[] mLoadedCounts;
long[] mUnpluggedCounts;
long[] mPluggedCounts;
public long[] mCounts;
public long[] mLoadedCounts;
public long[] mUnpluggedCounts;
public long[] mPluggedCounts;
LongSamplingCounterArray(TimeBase timeBase, Parcel in) {
private LongSamplingCounterArray(TimeBase timeBase, Parcel in) {
mTimeBase = timeBase;
mPluggedCounts = in.createLongArray();
mCounts = copyArray(mPluggedCounts, mCounts);
@@ -983,12 +984,12 @@ public class BatteryStatsImpl extends BatteryStats {
timeBase.add(this);
}
LongSamplingCounterArray(TimeBase timeBase) {
public LongSamplingCounterArray(TimeBase timeBase) {
mTimeBase = timeBase;
timeBase.add(this);
}
public void writeToParcel(Parcel out) {
private void writeToParcel(Parcel out) {
out.writeLongArray(mCounts);
out.writeLongArray(mLoadedCounts);
out.writeLongArray(mUnpluggedCounts);
@@ -1024,7 +1025,7 @@ public class BatteryStatsImpl extends BatteryStats {
+ " mPluggedCounts=" + Arrays.toString(mPluggedCounts));
}
void addCountLocked(long[] counts) {
public void addCountLocked(long[] counts) {
if (counts == null) {
return;
}
@@ -1039,7 +1040,7 @@ public class BatteryStatsImpl extends BatteryStats {
/**
* Clear state of this counter.
*/
void reset(boolean detachIfReset) {
public void reset(boolean detachIfReset) {
fillArray(mCounts, 0);
fillArray(mLoadedCounts, 0);
fillArray(mPluggedCounts, 0);
@@ -1049,21 +1050,60 @@ public class BatteryStatsImpl extends BatteryStats {
}
}
void detach() {
public void detach() {
mTimeBase.remove(this);
}
void writeSummaryFromParcelLocked(Parcel out) {
private void writeSummaryToParcelLocked(Parcel out) {
out.writeLongArray(mCounts);
}
void readSummaryFromParcelLocked(Parcel in) {
private void readSummaryFromParcelLocked(Parcel in) {
mCounts = in.createLongArray();
mLoadedCounts = copyArray(mCounts, mLoadedCounts);
mUnpluggedCounts = copyArray(mCounts, mUnpluggedCounts);
mPluggedCounts = copyArray(mCounts, mPluggedCounts);
}
public static void writeToParcel(Parcel out, LongSamplingCounterArray counterArray) {
if (counterArray != null) {
out.writeInt(1);
counterArray.writeToParcel(out);
} else {
out.writeInt(0);
}
}
public static LongSamplingCounterArray readFromParcel(Parcel in, TimeBase timeBase) {
if (in.readInt() != 0) {
return new LongSamplingCounterArray(timeBase, in);
} else {
return null;
}
}
public static void writeSummaryToParcelLocked(Parcel out,
LongSamplingCounterArray counterArray) {
if (counterArray != null) {
out.writeInt(1);
counterArray.writeSummaryToParcelLocked(out);
} else {
out.writeInt(0);
}
}
public static LongSamplingCounterArray readSummaryFromParcelLocked(Parcel in,
TimeBase timeBase) {
if (in.readInt() != 0) {
final LongSamplingCounterArray counterArray
= new LongSamplingCounterArray(timeBase);
counterArray.readSummaryFromParcelLocked(in);
return counterArray;
} else {
return null;
}
}
private void fillArray(long[] a, long val) {
if (a != null) {
Arrays.fill(a, val);
@@ -6927,18 +6967,8 @@ public class BatteryStatsImpl extends BatteryStats {
out.writeInt(0);
}
if (mCpuFreqTimeMs != null) {
out.writeInt(1);
mCpuFreqTimeMs.writeToParcel(out);
} else {
out.writeInt(0);
}
if (mScreenOffCpuFreqTimeMs != null) {
out.writeInt(1);
mScreenOffCpuFreqTimeMs.writeToParcel(out);
} else {
out.writeInt(0);
}
LongSamplingCounterArray.writeToParcel(out, mCpuFreqTimeMs);
LongSamplingCounterArray.writeToParcel(out, mScreenOffCpuFreqTimeMs);
if (mMobileRadioApWakeupCount != null) {
out.writeInt(1);
@@ -7187,17 +7217,9 @@ public class BatteryStatsImpl extends BatteryStats {
mCpuClusterSpeed = null;
}
if (in.readInt() != 0) {
mCpuFreqTimeMs = new LongSamplingCounterArray(mBsi.mOnBatteryTimeBase, in);
} else {
mCpuFreqTimeMs = null;
}
if (in.readInt() != 0) {
mScreenOffCpuFreqTimeMs = new LongSamplingCounterArray(
mBsi.mOnBatteryScreenOffTimeBase, in);
} else {
mScreenOffCpuFreqTimeMs = null;
}
mCpuFreqTimeMs = LongSamplingCounterArray.readFromParcel(in, mBsi.mOnBatteryTimeBase);
mScreenOffCpuFreqTimeMs = LongSamplingCounterArray.readFromParcel(
in, mBsi.mOnBatteryScreenOffTimeBase);
if (in.readInt() != 0) {
mMobileRadioApWakeupCount = new LongSamplingCounter(mBsi.mOnBatteryTimeBase, in);
@@ -11355,19 +11377,10 @@ public class BatteryStatsImpl extends BatteryStats {
u.mCpuClusterSpeed = null;
}
if (in.readInt() != 0) {
u.mCpuFreqTimeMs = new LongSamplingCounterArray(mOnBatteryTimeBase);
u.mCpuFreqTimeMs.readSummaryFromParcelLocked(in);
} else {
u.mCpuFreqTimeMs = null;
}
if (in.readInt() != 0) {
u.mScreenOffCpuFreqTimeMs = new LongSamplingCounterArray(
mOnBatteryScreenOffTimeBase);
u.mScreenOffCpuFreqTimeMs.readSummaryFromParcelLocked(in);
} else {
u.mScreenOffCpuFreqTimeMs = null;
}
u.mCpuFreqTimeMs = LongSamplingCounterArray.readSummaryFromParcelLocked(
in, mOnBatteryTimeBase);
u.mScreenOffCpuFreqTimeMs = LongSamplingCounterArray.readSummaryFromParcelLocked(
in, mOnBatteryScreenOffTimeBase);
if (in.readInt() != 0) {
u.mMobileRadioApWakeupCount = new LongSamplingCounter(mOnBatteryTimeBase);
@@ -11765,18 +11778,8 @@ public class BatteryStatsImpl extends BatteryStats {
out.writeInt(0);
}
if (u.mCpuFreqTimeMs != null) {
out.writeInt(1);
u.mCpuFreqTimeMs.writeSummaryFromParcelLocked(out);
} else {
out.writeInt(0);
}
if (u.mScreenOffCpuFreqTimeMs != null) {
out.writeInt(1);
u.mScreenOffCpuFreqTimeMs.writeSummaryFromParcelLocked(out);
} else {
out.writeInt(0);
}
LongSamplingCounterArray.writeSummaryToParcelLocked(out, u.mCpuFreqTimeMs);
LongSamplingCounterArray.writeSummaryToParcelLocked(out, u.mScreenOffCpuFreqTimeMs);
if (u.mMobileRadioApWakeupCount != null) {
out.writeInt(1);