am e46717b6: Fix issue @16555033: Battery history overflowing too much (7adcb6de) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/IPackageInstaller.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.content.pm.IPackageInstallerCallback;
		import android.content.pm.IPackageInstallerSession;
		import android.content.pm.InstallSessionInfo;
		import android.content.pm.InstallSessionParams;
		import android.os.ParcelFileDescriptor;

		/** {@hide} */
		interface IPackageInstaller {

core/java/android/os/BatteryStats.java

+71 −3

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.util.Printer;
		import android.util.SparseArray;
		import android.util.SparseIntArray;
		import android.util.TimeUtils;
		import android.view.Display;
		import com.android.internal.os.BatterySipper;
		import com.android.internal.os.BatteryStatsHelper;

		@@ -1596,6 +1597,27 @@ public abstract class BatteryStats implements Parcelable {
		*/
		public abstract long computeBatteryTimeRemaining(long curTime);

		// The part of a step duration that is the actual time.
		public static final long STEP_LEVEL_TIME_MASK = 0x000000ffffffffffL;

		// Bits in a step duration that are the new battery level we are at.
		public static final long STEP_LEVEL_LEVEL_MASK = 0x0000ff0000000000L;
		public static final long STEP_LEVEL_LEVEL_SHIFT = 40;

		// Bits in a step duration that are the initial mode we were in at that step.
		public static final long STEP_LEVEL_INITIAL_MODE_MASK = 0x00ff000000000000L;
		public static final long STEP_LEVEL_INITIAL_MODE_SHIFT = 48;

		// Bits in a step duration that indicate which modes changed during that step.
		public static final long STEP_LEVEL_MODIFIED_MODE_MASK = 0xff00000000000000L;
		public static final long STEP_LEVEL_MODIFIED_MODE_SHIFT = 56;

		// Step duration mode: the screen is on, off, dozed, etc; value is Display.STATE_* - 1.
		public static final int STEP_LEVEL_MODE_SCREEN_STATE = 0x03;

		// Step duration mode: power save is on.
		public static final int STEP_LEVEL_MODE_POWER_SAVE = 0x04;

		/**
		* Return the historical number of discharge steps we currently have.
		*/
		@@ -3620,14 +3642,60 @@ public abstract class BatteryStats implements Parcelable {
		if (!checkin) {
		pw.println(header);
		}
		String[] lineArgs = new String[1];
		String[] lineArgs = new String[4];
		for (int i=0; i<count; i++) {
		long duration = steps[i] & STEP_LEVEL_TIME_MASK;
		int level = (int)((steps[i] & STEP_LEVEL_LEVEL_MASK)
		>> STEP_LEVEL_LEVEL_SHIFT);
		long initMode = (steps[i] & STEP_LEVEL_INITIAL_MODE_MASK)
		>> STEP_LEVEL_INITIAL_MODE_SHIFT;
		long modMode = (steps[i] & STEP_LEVEL_MODIFIED_MODE_MASK)
		>> STEP_LEVEL_MODIFIED_MODE_SHIFT;
		if (checkin) {
		lineArgs[0] = Long.toString(steps[i]);
		lineArgs[0] = Long.toString(duration);
		lineArgs[1] = Integer.toString(level);
		if ((modMode&STEP_LEVEL_MODE_SCREEN_STATE) == 0) {
		switch ((int)(initMode&STEP_LEVEL_MODE_SCREEN_STATE) + 1) {
		case Display.STATE_OFF: lineArgs[2] = "s-"; break;
		case Display.STATE_ON: lineArgs[2] = "s+"; break;
		case Display.STATE_DOZE: lineArgs[2] = "sd"; break;
		case Display.STATE_DOZE_SUSPEND: lineArgs[2] = "sds"; break;
		default: lineArgs[1] = "?"; break;
		}
		} else {
		lineArgs[2] = "";
		}
		if ((modMode&STEP_LEVEL_MODE_POWER_SAVE) == 0) {
		lineArgs[3] = (initMode&STEP_LEVEL_MODE_POWER_SAVE) != 0 ? "p+" : "p-";
		} else {
		lineArgs[3] = "";
		}
		dumpLine(pw, 0 /* uid /, "i" / category */, header, (Object[])lineArgs);
		} else {
		pw.print(" #"); pw.print(i); pw.print(": ");
		TimeUtils.formatDuration(steps[i], pw);
		TimeUtils.formatDuration(duration, pw);
		pw.print(" to "); pw.print(level);
		boolean haveModes = false;
		if ((modMode&STEP_LEVEL_MODE_SCREEN_STATE) == 0) {
		pw.print(" (");
		switch ((int)(initMode&STEP_LEVEL_MODE_SCREEN_STATE) + 1) {
		case Display.STATE_OFF: pw.print("screen-off"); break;
		case Display.STATE_ON: pw.print("screen-on"); break;
		case Display.STATE_DOZE: pw.print("screen-doze"); break;
		case Display.STATE_DOZE_SUSPEND: pw.print("screen-doze-suspend"); break;
		default: lineArgs[1] = "screen-?"; break;
		}
		haveModes = true;
		}
		if ((modMode&STEP_LEVEL_MODE_POWER_SAVE) == 0) {
		pw.print(haveModes ? ", " : " (");
		pw.print((initMode&STEP_LEVEL_MODE_POWER_SAVE) != 0
		? "power-save-on" : "power-save-off");
		haveModes = true;
		}
		if (haveModes) {
		pw.print(")");
		}
		pw.println();
		}
		}

core/java/android/os/IUserManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		package android.os;

		import android.os.Bundle;
		import android.os.ParcelFileDescriptor;
		import android.content.pm.UserInfo;
		import android.content.RestrictionEntry;
		import android.graphics.Bitmap;

core/java/com/android/internal/app/IBatteryStats.aidl

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.app;

		import com.android.internal.os.BatteryStatsImpl;

		import android.os.ParcelFileDescriptor;
		import android.os.WorkSource;
		import android.telephony.DataConnectionRealTimeInfo;
		import android.telephony.SignalStrength;
		@@ -37,6 +38,8 @@ interface IBatteryStats {
		// Remaining methods are only used in Java.
		byte[] getStatistics();

		ParcelFileDescriptor getStatisticsStream();

		// Return the computed amount of time remaining on battery, in milliseconds.
		// Returns -1 if nothing could be computed.
		long computeBatteryTimeRemaining();

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ import java.io.IOException;
		* appropriate mutual exclusion invariants whenever it accesses the file.
		* </p>
		*/
		public class AtomicFile {
		public final class AtomicFile {
		private final File mBaseName;
		private final File mBackupName;

		@@ -130,6 +130,15 @@ public class AtomicFile {
		}
		}

		public boolean exists() {
		return mBaseName.exists() \|\| mBackupName.exists();
		}

		public void delete() {
		mBaseName.delete();
		mBackupName.delete();
		}

		public FileInputStream openRead() throws FileNotFoundException {
		if (mBackupName.exists()) {
		mBaseName.delete();