Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c2886ba authored Mar 08, 2017 by Santos Cordon Committed by Android (Google) Code Review Mar 08, 2017

Merge "Map STATE_VR to STATE_ON for Battery Stats."

parents cf8a98af e94f0501

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43586,6 +43586,7 @@ package android.view {
	field public static final int STATE_OFF = 1; // 0x1		field public static final int STATE_OFF = 1; // 0x1
	field public static final int STATE_ON = 2; // 0x2		field public static final int STATE_ON = 2; // 0x2
	field public static final int STATE_UNKNOWN = 0; // 0x0		field public static final int STATE_UNKNOWN = 0; // 0x0
			field public static final int STATE_VR = 5; // 0x5
	}		}

	public static final class Display.HdrCapabilities implements android.os.Parcelable {		public static final class Display.HdrCapabilities implements android.os.Parcelable {

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47046,6 +47046,7 @@ package android.view {
	field public static final int STATE_OFF = 1; // 0x1		field public static final int STATE_OFF = 1; // 0x1
	field public static final int STATE_ON = 2; // 0x2		field public static final int STATE_ON = 2; // 0x2
	field public static final int STATE_UNKNOWN = 0; // 0x0		field public static final int STATE_UNKNOWN = 0; // 0x0
			field public static final int STATE_VR = 5; // 0x5
	}		}

	public static final class Display.HdrCapabilities implements android.os.Parcelable {		public static final class Display.HdrCapabilities implements android.os.Parcelable {

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43944,6 +43944,7 @@ package android.view {
	field public static final int STATE_OFF = 1; // 0x1		field public static final int STATE_OFF = 1; // 0x1
	field public static final int STATE_ON = 2; // 0x2		field public static final int STATE_ON = 2; // 0x2
	field public static final int STATE_UNKNOWN = 0; // 0x0		field public static final int STATE_UNKNOWN = 0; // 0x0
			field public static final int STATE_VR = 5; // 0x5
	}		}

	public static final class Display.HdrCapabilities implements android.os.Parcelable {		public static final class Display.HdrCapabilities implements android.os.Parcelable {

core/java/android/os/BatteryStats.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2410,6 +2410,10 @@ public abstract class BatteryStats implements Parcelable {
	// Step duration mode: the screen is on, off, dozed, etc; value is Display.STATE_* - 1.		// 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;		public static final int STEP_LEVEL_MODE_SCREEN_STATE = 0x03;

			// The largest value for screen state that is tracked in battery states. Any values above
			// this should be mapped back to one of the tracked values before being tracked here.
			public static final int MAX_TRACKED_SCREEN_STATE = Display.STATE_DOZE_SUSPEND;

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

core/java/android/view/Display.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -302,7 +302,6 @@ public final class Display {
	*		*
	* @see #getState		* @see #getState
	* @see android.os.PowerManager#isInteractive		* @see android.os.PowerManager#isInteractive
	* @hide
	*/		*/
	public static final int STATE_VR = 5;		public static final int STATE_VR = 5;