Merge changes from topic "battery_usage_stats_before_reset" into sc-dev (4f3d2e64) · Commits · e / os / android_frameworks_base

core/java/android/os/AggregateBatteryConsumer.java

+51 −0

Original line number	Diff line number	Diff line
		@@ -17,7 +17,13 @@
		package android.os;

		import android.annotation.NonNull;
		import android.util.TypedXmlPullParser;
		import android.util.TypedXmlSerializer;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		import java.io.IOException;
		import java.io.PrintWriter;

		/**
		@@ -72,6 +78,43 @@ public final class AggregateBatteryConsumer extends BatteryConsumer implements P
		return mConsumedPowerMah;
		}

		/** Serializes this object to XML */
		void writeToXml(TypedXmlSerializer serializer,
		@BatteryUsageStats.AggregateBatteryConsumerScope int scope) throws IOException {
		serializer.startTag(null, BatteryUsageStats.XML_TAG_AGGREGATE);
		serializer.attributeInt(null, BatteryUsageStats.XML_ATTR_SCOPE, scope);
		serializer.attributeDouble(null, BatteryUsageStats.XML_ATTR_POWER, mConsumedPowerMah);
		mPowerComponents.writeToXml(serializer);
		serializer.endTag(null, BatteryUsageStats.XML_TAG_AGGREGATE);
		}

		/** Parses an XML representation and populates the BatteryUsageStats builder */
		static void parseXml(TypedXmlPullParser parser, BatteryUsageStats.Builder builder)
		throws XmlPullParserException, IOException {
		final int scope = parser.getAttributeInt(null, BatteryUsageStats.XML_ATTR_SCOPE);
		final Builder consumerBuilder = builder.getAggregateBatteryConsumerBuilder(scope);

		int eventType = parser.getEventType();
		if (eventType != XmlPullParser.START_TAG \|\| !parser.getName().equals(
		BatteryUsageStats.XML_TAG_AGGREGATE)) {
		throw new XmlPullParserException("Invalid XML parser state");
		}

		consumerBuilder.setConsumedPower(
		parser.getAttributeDouble(null, BatteryUsageStats.XML_ATTR_POWER));

		while (!(eventType == XmlPullParser.END_TAG && parser.getName().equals(
		BatteryUsageStats.XML_TAG_AGGREGATE))
		&& eventType != XmlPullParser.END_DOCUMENT) {
		if (eventType == XmlPullParser.START_TAG) {
		if (parser.getName().equals(BatteryUsageStats.XML_TAG_POWER_COMPONENTS)) {
		PowerComponents.parseXml(parser, consumerBuilder.mPowerComponentsBuilder);
		}
		}
		eventType = parser.next();
		}
		}

		/**
		* Builder for DeviceBatteryConsumer.
		*/
		@@ -90,6 +133,14 @@ public final class AggregateBatteryConsumer extends BatteryConsumer implements P
		return this;
		}

		/**
		* Adds power and usage duration from the supplied AggregateBatteryConsumer.
		*/
		public void add(AggregateBatteryConsumer aggregateBatteryConsumer) {
		mConsumedPowerMah += aggregateBatteryConsumer.mConsumedPowerMah;
		mPowerComponentsBuilder.addPowerAndDuration(aggregateBatteryConsumer.mPowerComponents);
		}

		/**
		* Creates a read-only object out of the Builder values.
		*/

core/java/android/os/BatteryUsageStats.java

+217 −5

Original line number	Diff line number	Diff line
		@@ -20,16 +20,23 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.util.Range;
		import android.util.SparseArray;
		import android.util.TypedXmlPullParser;
		import android.util.TypedXmlSerializer;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.os.BatteryStatsHistory;
		import com.android.internal.os.BatteryStatsHistoryIterator;
		import com.android.internal.os.PowerCalculator;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		import java.io.IOException;
		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Comparator;
		import java.util.List;

		@@ -77,6 +84,34 @@ public final class BatteryUsageStats implements Parcelable {

		private static final int STATSD_PULL_ATOM_MAX_BYTES = 45000;

		// XML tags and attributes for BatteryUsageStats persistence
		static final String XML_TAG_BATTERY_USAGE_STATS = "battery_usage_stats";
		static final String XML_TAG_AGGREGATE = "aggregate";
		static final String XML_TAG_UID = "uid";
		static final String XML_TAG_USER = "user";
		static final String XML_TAG_POWER_COMPONENTS = "power_components";
		static final String XML_TAG_COMPONENT = "component";
		static final String XML_TAG_CUSTOM_COMPONENT = "custom_component";
		static final String XML_ATTR_ID = "id";
		static final String XML_ATTR_UID = "uid";
		static final String XML_ATTR_USER_ID = "user_id";
		static final String XML_ATTR_SCOPE = "scope";
		static final String XML_ATTR_PREFIX_CUSTOM_COMPONENT = "custom_component_";
		static final String XML_ATTR_START_TIMESTAMP = "start_timestamp";
		static final String XML_ATTR_END_TIMESTAMP = "end_timestamp";
		static final String XML_ATTR_POWER = "power";
		static final String XML_ATTR_DURATION = "duration";
		static final String XML_ATTR_MODEL = "model";
		static final String XML_ATTR_BATTERY_CAPACITY = "battery_capacity";
		static final String XML_ATTR_DISCHARGE_PERCENT = "discharge_pct";
		static final String XML_ATTR_DISCHARGE_LOWER = "discharge_lower";
		static final String XML_ATTR_DISCHARGE_UPPER = "discharge_upper";
		static final String XML_ATTR_BATTERY_REMAINING = "battery_remaining";
		static final String XML_ATTR_CHARGE_REMAINING = "charge_remaining";
		static final String XML_ATTR_HIGHEST_DRAIN_PACKAGE = "highest_drain_package";
		static final String XML_ATTR_TIME_IN_FOREGROUND = "time_in_foreground";
		static final String XML_ATTR_TIME_IN_BACKGROUND = "time_in_background";

		private final int mDischargePercentage;
		private final double mBatteryCapacityMah;
		private final long mStatsStartTimestampMs;
		@@ -96,11 +131,7 @@ public final class BatteryUsageStats implements Parcelable {
		private BatteryUsageStats(@NonNull Builder builder) {
		mStatsStartTimestampMs = builder.mStatsStartTimestampMs;
		mStatsEndTimestampMs = builder.mStatsEndTimestampMs;
		if (builder.mStatsDurationMs != -1) {
		mStatsDurationMs = builder.mStatsDurationMs;
		} else {
		mStatsDurationMs = mStatsEndTimestampMs - mStatsStartTimestampMs;
		}
		mStatsDurationMs = builder.getStatsDuration();
		mBatteryCapacityMah = builder.mBatteryCapacityMah;
		mDischargePercentage = builder.mDischargePercentage;
		mDischargedPowerLowerBound = builder.mDischargedPowerLowerBoundMah;
		@@ -579,6 +610,109 @@ public final class BatteryUsageStats implements Parcelable {
		}
		}

		/** Serializes this object to XML */
		public void writeXml(TypedXmlSerializer serializer) throws IOException {
		serializer.startTag(null, XML_TAG_BATTERY_USAGE_STATS);

		for (int i = 0; i < mCustomPowerComponentNames.length; i++) {
		serializer.attribute(null, XML_ATTR_PREFIX_CUSTOM_COMPONENT + i,
		mCustomPowerComponentNames[i]);
		}

		serializer.attributeLong(null, XML_ATTR_START_TIMESTAMP, mStatsStartTimestampMs);
		serializer.attributeLong(null, XML_ATTR_END_TIMESTAMP, mStatsEndTimestampMs);
		serializer.attributeLong(null, XML_ATTR_DURATION, mStatsDurationMs);
		serializer.attributeDouble(null, XML_ATTR_BATTERY_CAPACITY, mBatteryCapacityMah);
		serializer.attributeInt(null, XML_ATTR_DISCHARGE_PERCENT, mDischargePercentage);
		serializer.attributeDouble(null, XML_ATTR_DISCHARGE_LOWER, mDischargedPowerLowerBound);
		serializer.attributeDouble(null, XML_ATTR_DISCHARGE_UPPER, mDischargedPowerUpperBound);
		serializer.attributeLong(null, XML_ATTR_BATTERY_REMAINING, mBatteryTimeRemainingMs);
		serializer.attributeLong(null, XML_ATTR_CHARGE_REMAINING, mChargeTimeRemainingMs);

		for (int scope = 0; scope < BatteryUsageStats.AGGREGATE_BATTERY_CONSUMER_SCOPE_COUNT;
		scope++) {
		mAggregateBatteryConsumers[scope].writeToXml(serializer, scope);
		}
		for (UidBatteryConsumer consumer : mUidBatteryConsumers) {
		consumer.writeToXml(serializer);
		}
		for (UserBatteryConsumer consumer : mUserBatteryConsumers) {
		consumer.writeToXml(serializer);
		}
		serializer.endTag(null, XML_TAG_BATTERY_USAGE_STATS);
		}

		/** Parses an XML representation of BatteryUsageStats */
		public static BatteryUsageStats createFromXml(TypedXmlPullParser parser)
		throws XmlPullParserException, IOException {
		Builder builder = null;
		int eventType = parser.getEventType();
		while (eventType != XmlPullParser.END_DOCUMENT) {
		if (eventType == XmlPullParser.START_TAG
		&& parser.getName().equals(XML_TAG_BATTERY_USAGE_STATS)) {
		List<String> customComponentNames = new ArrayList<>();
		int i = 0;
		while (true) {
		int index = parser.getAttributeIndex(null,
		XML_ATTR_PREFIX_CUSTOM_COMPONENT + i);
		if (index == -1) {
		break;
		}
		customComponentNames.add(parser.getAttributeValue(index));
		i++;
		}

		builder = new Builder(
		customComponentNames.toArray(new String[0]), true);

		builder.setStatsStartTimestamp(
		parser.getAttributeLong(null, XML_ATTR_START_TIMESTAMP));
		builder.setStatsEndTimestamp(
		parser.getAttributeLong(null, XML_ATTR_END_TIMESTAMP));
		builder.setStatsDuration(
		parser.getAttributeLong(null, XML_ATTR_DURATION));
		builder.setBatteryCapacity(
		parser.getAttributeDouble(null, XML_ATTR_BATTERY_CAPACITY));
		builder.setDischargePercentage(
		parser.getAttributeInt(null, XML_ATTR_DISCHARGE_PERCENT));
		builder.setDischargedPowerRange(
		parser.getAttributeDouble(null, XML_ATTR_DISCHARGE_LOWER),
		parser.getAttributeDouble(null, XML_ATTR_DISCHARGE_UPPER));
		builder.setBatteryTimeRemainingMs(
		parser.getAttributeLong(null, XML_ATTR_BATTERY_REMAINING));
		builder.setChargeTimeRemainingMs(
		parser.getAttributeLong(null, XML_ATTR_CHARGE_REMAINING));

		eventType = parser.next();
		break;
		}
		eventType = parser.next();
		}

		if (builder == null) {
		throw new XmlPullParserException("No root element");
		}

		while (eventType != XmlPullParser.END_DOCUMENT) {
		if (eventType == XmlPullParser.START_TAG) {
		switch (parser.getName()) {
		case XML_TAG_AGGREGATE:
		AggregateBatteryConsumer.parseXml(parser, builder);
		break;
		case XML_TAG_UID:
		UidBatteryConsumer.createFromXml(parser, builder);
		break;
		case XML_TAG_USER:
		UserBatteryConsumer.createFromXml(parser, builder);
		break;
		}
		}
		eventType = parser.next();
		}

		return builder.build();
		}

		/**
		* Builder for BatteryUsageStats.
		*/
		@@ -658,6 +792,14 @@ public final class BatteryUsageStats implements Parcelable {
		return this;
		}

		private long getStatsDuration() {
		if (mStatsDurationMs != -1) {
		return mStatsDurationMs;
		} else {
		return mStatsEndTimestampMs - mStatsStartTimestampMs;
		}
		}

		/**
		* Sets the battery discharge amount since BatteryStats reset as percentage of the full
		* charge.
		@@ -737,6 +879,22 @@ public final class BatteryUsageStats implements Parcelable {
		return builder;
		}

		/**
		* Creates or returns a UidBatteryConsumer, which represents battery attribution
		* data for an individual UID. This version of the method is not suitable for use
		* with PowerCalculators.
		*/
		@NonNull
		public UidBatteryConsumer.Builder getOrCreateUidBatteryConsumerBuilder(int uid) {
		UidBatteryConsumer.Builder builder = mUidBatteryConsumerBuilders.get(uid);
		if (builder == null) {
		builder = new UidBatteryConsumer.Builder(mCustomPowerComponentNames,
		mIncludePowerModels, uid);
		mUidBatteryConsumerBuilders.put(uid, builder);
		}
		return builder;
		}

		/**
		* Creates or returns a UserBatteryConsumer, which represents battery attribution
		* data for an individual {@link UserHandle}.
		@@ -756,5 +914,59 @@ public final class BatteryUsageStats implements Parcelable {
		public SparseArray<UidBatteryConsumer.Builder> getUidBatteryConsumerBuilders() {
		return mUidBatteryConsumerBuilders;
		}

		/**
		* Adds battery usage stats from another snapshots. The two snapshots are assumed to be
		* non-overlapping, meaning that the power consumption estimates and session durations
		* can be simply summed across the two snapshots. This remains true even if the timestamps
		* seem to indicate that the sessions are in fact overlapping: timestamps may be off as a
		* result of realtime clock adjustments by the user or the system.
		*/
		@NonNull
		public Builder add(BatteryUsageStats stats) {
		if (!Arrays.equals(mCustomPowerComponentNames, stats.mCustomPowerComponentNames)) {
		throw new IllegalArgumentException(
		"BatteryUsageStats have different custom power components");
		}

		if (mUserBatteryConsumerBuilders.size() != 0
		\|\| !stats.getUserBatteryConsumers().isEmpty()) {
		throw new UnsupportedOperationException(
		"Combining UserBatteryConsumers is not supported");
		}

		mDischargedPowerLowerBoundMah += stats.mDischargedPowerLowerBound;
		mDischargedPowerUpperBoundMah += stats.mDischargedPowerUpperBound;
		mDischargePercentage += stats.mDischargePercentage;

		mStatsDurationMs = getStatsDuration() + stats.getStatsDuration();

		if (mStatsStartTimestampMs == 0
		\|\| stats.mStatsStartTimestampMs < mStatsStartTimestampMs) {
		mStatsStartTimestampMs = stats.mStatsStartTimestampMs;
		}

		final boolean addingLaterSnapshot = stats.mStatsEndTimestampMs > mStatsEndTimestampMs;
		if (addingLaterSnapshot) {
		mStatsEndTimestampMs = stats.mStatsEndTimestampMs;
		}

		for (int scope = 0; scope < AGGREGATE_BATTERY_CONSUMER_SCOPE_COUNT; scope++) {
		getAggregateBatteryConsumerBuilder(scope)
		.add(stats.mAggregateBatteryConsumers[scope]);
		}

		for (UidBatteryConsumer consumer : stats.getUidBatteryConsumers()) {
		getOrCreateUidBatteryConsumerBuilder(consumer.getUid()).add(consumer);
		}

		if (addingLaterSnapshot) {
		mBatteryCapacityMah = stats.mBatteryCapacityMah;
		mBatteryTimeRemainingMs = stats.mBatteryTimeRemainingMs;
		mChargeTimeRemainingMs = stats.mChargeTimeRemainingMs;
		}

		return this;
		}
		}
		}

core/java/android/os/BatteryUsageStatsQuery.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -72,12 +72,16 @@ public final class BatteryUsageStatsQuery implements Parcelable {
		@NonNull
		private final int[] mUserIds;
		private final long mMaxStatsAgeMs;
		private long mFromTimestamp;
		private long mToTimestamp;

		private BatteryUsageStatsQuery(@NonNull Builder builder) {
		mFlags = builder.mFlags;
		mUserIds = builder.mUserIds != null ? builder.mUserIds.toArray()
		: new int[]{UserHandle.USER_ALL};
		mMaxStatsAgeMs = builder.mMaxStatsAgeMs;
		mFromTimestamp = builder.mFromTimestamp;
		mToTimestamp = builder.mToTimestamp;
		}

		@BatteryUsageStatsFlags
		@@ -112,11 +116,30 @@ public final class BatteryUsageStatsQuery implements Parcelable {
		return mMaxStatsAgeMs;
		}

		/**
		* Returns the exclusive lower bound of the stored snapshot timestamps that should be included
		* in the aggregation. Ignored if {@link #getToTimestamp()} is zero.
		*/
		public long getFromTimestamp() {
		return mFromTimestamp;
		}

		/**
		* Returns the inclusive upper bound of the stored snapshot timestamps that should
		* be included in the aggregation. The default is to include only the current stats
		* accumulated since the latest battery reset.
		*/
		public long getToTimestamp() {
		return mToTimestamp;
		}

		private BatteryUsageStatsQuery(Parcel in) {
		mFlags = in.readInt();
		mUserIds = new int[in.readInt()];
		in.readIntArray(mUserIds);
		mMaxStatsAgeMs = in.readLong();
		mFromTimestamp = in.readLong();
		mToTimestamp = in.readLong();
		}

		@Override
		@@ -125,6 +148,8 @@ public final class BatteryUsageStatsQuery implements Parcelable {
		dest.writeInt(mUserIds.length);
		dest.writeIntArray(mUserIds);
		dest.writeLong(mMaxStatsAgeMs);
		dest.writeLong(mFromTimestamp);
		dest.writeLong(mToTimestamp);
		}

		@Override
		@@ -153,6 +178,8 @@ public final class BatteryUsageStatsQuery implements Parcelable {
		private int mFlags;
		private IntArray mUserIds;
		private long mMaxStatsAgeMs = DEFAULT_MAX_STATS_AGE_MS;
		private long mFromTimestamp;
		private long mToTimestamp;

		/**
		* Builds a read-only BatteryUsageStatsQuery object.
		@@ -203,6 +230,17 @@ public final class BatteryUsageStatsQuery implements Parcelable {
		return this;
		}

		/**
		* Requests to aggregate stored snapshots between the two supplied timestamps
		* @param fromTimestamp Exclusive starting timestamp, as per System.currentTimeMillis()
		* @param toTimestamp Inclusive ending timestamp, as per System.currentTimeMillis()
		*/
		public Builder aggregateSnapshots(long fromTimestamp, long toTimestamp) {
		mFromTimestamp = fromTimestamp;
		mToTimestamp = toTimestamp;
		return this;
		}

		/**
		* Set the client's tolerance for stale battery stats. The data may be up to
		* this many milliseconds out-of-date.

core/java/android/os/PowerComponents.java

+178 −5

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/UidBatteryConsumer.java

+99 −2

Original line number	Diff line number	Diff line
		@@ -19,9 +19,16 @@ package android.os;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.text.TextUtils;
		import android.util.TypedXmlPullParser;
		import android.util.TypedXmlSerializer;

		import com.android.internal.os.PowerCalculator;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		import java.io.IOException;
		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -143,13 +150,65 @@ public final class UidBatteryConsumer extends BatteryConsumer implements Parcela
		return 0;
		}

		/** Serializes this object to XML */
		void writeToXml(TypedXmlSerializer serializer) throws IOException {
		if (getConsumedPower() == 0) {
		return;
		}

		serializer.startTag(null, BatteryUsageStats.XML_TAG_UID);
		serializer.attributeInt(null, BatteryUsageStats.XML_ATTR_UID, getUid());
		if (!TextUtils.isEmpty(mPackageWithHighestDrain)) {
		serializer.attribute(null, BatteryUsageStats.XML_ATTR_HIGHEST_DRAIN_PACKAGE,
		mPackageWithHighestDrain);
		}
		serializer.attributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_FOREGROUND,
		mTimeInForegroundMs);
		serializer.attributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_BACKGROUND,
		mTimeInBackgroundMs);
		mPowerComponents.writeToXml(serializer);
		serializer.endTag(null, BatteryUsageStats.XML_TAG_UID);
		}

		/** Parses an XML representation and populates the BatteryUsageStats builder */
		static void createFromXml(TypedXmlPullParser parser, BatteryUsageStats.Builder builder)
		throws XmlPullParserException, IOException {
		final int uid = parser.getAttributeInt(null, BatteryUsageStats.XML_ATTR_UID);
		final UidBatteryConsumer.Builder consumerBuilder =
		builder.getOrCreateUidBatteryConsumerBuilder(uid);

		int eventType = parser.getEventType();
		if (eventType != XmlPullParser.START_TAG
		\|\| !parser.getName().equals(BatteryUsageStats.XML_TAG_UID)) {
		throw new XmlPullParserException("Invalid XML parser state");
		}

		consumerBuilder.setPackageWithHighestDrain(
		parser.getAttributeValue(null, BatteryUsageStats.XML_ATTR_HIGHEST_DRAIN_PACKAGE));
		consumerBuilder.setTimeInStateMs(STATE_FOREGROUND,
		parser.getAttributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_FOREGROUND));
		consumerBuilder.setTimeInStateMs(STATE_BACKGROUND,
		parser.getAttributeLong(null, BatteryUsageStats.XML_ATTR_TIME_IN_BACKGROUND));
		while (!(eventType == XmlPullParser.END_TAG
		&& parser.getName().equals(BatteryUsageStats.XML_TAG_UID))
		&& eventType != XmlPullParser.END_DOCUMENT) {
		if (eventType == XmlPullParser.START_TAG) {
		if (parser.getName().equals(BatteryUsageStats.XML_TAG_POWER_COMPONENTS)) {
		PowerComponents.parseXml(parser, consumerBuilder.mPowerComponentsBuilder);
		}
		}
		eventType = parser.next();
		}
		}

		/**
		* Builder for UidBatteryConsumer.
		*/
		public static final class Builder extends BaseBuilder<Builder> {
		private static final String PACKAGE_NAME_UNINITIALIZED = "";
		private final BatteryStats.Uid mBatteryStatsUid;
		private final int mUid;
		private String mPackageWithHighestDrain;
		private String mPackageWithHighestDrain = PACKAGE_NAME_UNINITIALIZED;
		public long mTimeInForegroundMs;
		public long mTimeInBackgroundMs;
		private boolean mExcludeFromBatteryUsageStats;
		@@ -161,8 +220,19 @@ public final class UidBatteryConsumer extends BatteryConsumer implements Parcela
		mUid = batteryStatsUid.getUid();
		}

		public Builder(@NonNull String[] customPowerComponentNames, boolean includePowerModels,
		int uid) {
		super(customPowerComponentNames, includePowerModels);
		mBatteryStatsUid = null;
		mUid = uid;
		}

		@NonNull
		public BatteryStats.Uid getBatteryStatsUid() {
		if (mBatteryStatsUid == null) {
		throw new IllegalStateException(
		"UidBatteryConsumer.Builder was initialized without a BatteryStats.Uid");
		}
		return mBatteryStatsUid;
		}

		@@ -176,7 +246,7 @@ public final class UidBatteryConsumer extends BatteryConsumer implements Parcela
		*/
		@NonNull
		public Builder setPackageWithHighestDrain(@Nullable String packageName) {
		mPackageWithHighestDrain = packageName;
		mPackageWithHighestDrain = TextUtils.nullIfEmpty(packageName);
		return this;
		}

		@@ -207,6 +277,30 @@ public final class UidBatteryConsumer extends BatteryConsumer implements Parcela
		return this;
		}

		/**
		* Adds power and usage duration from the supplied UidBatteryConsumer.
		*/
		public Builder add(UidBatteryConsumer consumer) {
		mPowerComponentsBuilder.addPowerAndDuration(consumer.mPowerComponents);
		mTimeInBackgroundMs += consumer.mTimeInBackgroundMs;
		mTimeInForegroundMs += consumer.mTimeInForegroundMs;

		if (mPackageWithHighestDrain == PACKAGE_NAME_UNINITIALIZED) {
		mPackageWithHighestDrain = consumer.mPackageWithHighestDrain;
		} else if (!TextUtils.equals(mPackageWithHighestDrain,
		consumer.mPackageWithHighestDrain)) {
		// Consider combining two UidBatteryConsumers with this distribution
		// of power drain between packages:
		// (package1=100, package2=10) and (package1=100, package2=101).
		// Since we don't know the actual power distribution between packages at this
		// point, we have no way to correctly declare package1 as the winner.
		// The naive logic of picking the consumer with the higher total consumed
		// power would produce an incorrect result.
		mPackageWithHighestDrain = null;
		}
		return this;
		}

		/**
		* Returns true if this UidBatteryConsumer must be excluded from the
		* BatteryUsageStats.
		@@ -220,6 +314,9 @@ public final class UidBatteryConsumer extends BatteryConsumer implements Parcela
		*/
		@NonNull
		public UidBatteryConsumer build() {
		if (mPackageWithHighestDrain == PACKAGE_NAME_UNINITIALIZED) {
		mPackageWithHighestDrain = null;
		}
		return new UidBatteryConsumer(this);
		}
		}