Merge "Change getStatsStartRealtime to getStatsStartTimestamp" into sc-dev (f2dca815) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryUsageStats.java

+11 −10

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ import java.util.List;
		public final class BatteryUsageStats implements Parcelable {
		private final double mConsumedPower;
		private final int mDischargePercentage;
		private final long mStatsStartRealtimeMs;
		private final long mStatsStartTimestampMs;
		private final double mDischargedPowerLowerBound;
		private final double mDischargedPowerUpperBound;
		private final long mBatteryTimeRemainingMs;
		@@ -46,7 +46,7 @@ public final class BatteryUsageStats implements Parcelable {
		private final List<BatteryStats.HistoryTag> mHistoryTagPool;

		private BatteryUsageStats(@NonNull Builder builder) {
		mStatsStartRealtimeMs = builder.mStatsStartRealtimeMs;
		mStatsStartTimestampMs = builder.mStatsStartTimestampMs;
		mDischargePercentage = builder.mDischargePercentage;
		mDischargedPowerLowerBound = builder.mDischargedPowerLowerBoundMah;
		mDischargedPowerUpperBound = builder.mDischargedPowerUpperBoundMah;
		@@ -91,10 +91,11 @@ public final class BatteryUsageStats implements Parcelable {
		}

		/**
		* Timestamp of the latest battery stats reset, in milliseconds.
		* Timestamp (as returned by System.currentTimeMillis()) of the latest battery stats reset, in
		* milliseconds.
		*/
		public long getStatsStartRealtime() {
		return mStatsStartRealtimeMs;
		public long getStatsStartTimestamp() {
		return mStatsStartTimestampMs;
		}

		/**
		@@ -174,7 +175,7 @@ public final class BatteryUsageStats implements Parcelable {
		}

		private BatteryUsageStats(@NonNull Parcel source) {
		mStatsStartRealtimeMs = source.readLong();
		mStatsStartTimestampMs = source.readLong();
		mConsumedPower = source.readDouble();
		mDischargePercentage = source.readInt();
		mDischargedPowerLowerBound = source.readDouble();
		@@ -214,7 +215,7 @@ public final class BatteryUsageStats implements Parcelable {

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeLong(mStatsStartRealtimeMs);
		dest.writeLong(mStatsStartTimestampMs);
		dest.writeDouble(mConsumedPower);
		dest.writeInt(mDischargePercentage);
		dest.writeDouble(mDischargedPowerLowerBound);
		@@ -260,7 +261,7 @@ public final class BatteryUsageStats implements Parcelable {
		public static final class Builder {
		private final int mCustomPowerComponentCount;
		private final int mCustomTimeComponentCount;
		private long mStatsStartRealtimeMs;
		private long mStatsStartTimestampMs;
		private int mDischargePercentage;
		private double mDischargedPowerLowerBoundMah;
		private double mDischargedPowerUpperBoundMah;
		@@ -291,8 +292,8 @@ public final class BatteryUsageStats implements Parcelable {
		/**
		* Sets the timestamp of the latest battery stats reset, in milliseconds.
		*/
		public Builder setStatsStartRealtime(long statsStartRealtimeMs) {
		mStatsStartRealtimeMs = statsStartRealtimeMs;
		public Builder setStatsStartTimestamp(long statsStartTimestampMs) {
		mStatsStartTimestampMs = statsStartTimestampMs;
		return this;
		}

core/java/com/android/internal/os/BatteryStatsImpl.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1195,6 +1195,7 @@ public class BatteryStatsImpl extends BatteryStats {

		public BatteryStatsImpl(Clocks clocks) {
		init(clocks);
		mStartClockTimeMs = System.currentTimeMillis();
		mStatsFile = null;
		mCheckinFile = null;
		mDailyFile = null;

core/java/com/android/internal/os/BatteryUsageStatsProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ public class BatteryUsageStatsProvider {

		final BatteryUsageStats.Builder batteryUsageStatsBuilder =
		new BatteryUsageStats.Builder(customPowerComponentCount, customTimeComponentCount)
		.setStatsStartRealtime(mStats.getStatsStartRealtime() / 1000);
		.setStatsStartTimestamp(mStats.getStartClockTime());

		SparseArray<? extends BatteryStats.Uid> uidStats = mStats.getUidStats();
		for (int i = uidStats.size() - 1; i >= 0; i--) {

core/tests/coretests/src/com/android/internal/os/BatteryUsageStatsTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,8 @@ public class BatteryUsageStatsTest {

		final BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(1, 1)
		.setDischargePercentage(20)
		.setDischargedPowerRange(1000, 2000);
		.setDischargedPowerRange(1000, 2000)
		.setStatsStartTimestamp(1000);

		builder.getOrCreateUidBatteryConsumerBuilder(batteryStatsUid)
		.setPackageWithHighestDrain("foo")
		@@ -105,6 +106,7 @@ public class BatteryUsageStatsTest {
		assertThat(batteryUsageStats.getDischargePercentage()).isEqualTo(20);
		assertThat(batteryUsageStats.getDischargedPowerRange().getLower()).isEqualTo(1000);
		assertThat(batteryUsageStats.getDischargedPowerRange().getUpper()).isEqualTo(2000);
		assertThat(batteryUsageStats.getStatsStartTimestamp()).isEqualTo(1000);

		final List<UidBatteryConsumer> uidBatteryConsumers =
		batteryUsageStats.getUidBatteryConsumers();