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

Commit e94f0501 authored Feb 24, 2017 by Santos Cordon

Map STATE_VR to STATE_ON for Battery Stats.

Also, sets STATE_VR to be a public API value for Android O release.

Test: Switch to VR mode, ensure "Unexpected screen state: 5" no
longer logs from BatteryStatsImpl
Bug: 35636815

Change-Id: I1f8be334967e1af1f92a3ed571c063e7b00106b1

parent d7f52c1b

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -43128,6 +43128,7 @@ package android.view {
		field public static final int STATE_OFF = 1; // 0x1
		field public static final int STATE_ON = 2; // 0x2
		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 {

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -46467,6 +46467,7 @@ package android.view {
		field public static final int STATE_OFF = 1; // 0x1
		field public static final int STATE_ON = 2; // 0x2
		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 {

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -43481,6 +43481,7 @@ package android.view {
		field public static final int STATE_OFF = 1; // 0x1
		field public static final int STATE_ON = 2; // 0x2
		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 {

core/java/android/os/BatteryStats.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -2406,6 +2406,10 @@ public abstract class BatteryStats implements Parcelable {
		// 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;

		// 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.
		public static final int STEP_LEVEL_MODE_POWER_SAVE = 0x04;

core/java/android/view/Display.java

+0 −1

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