e94f05019c94b04c92d2b89190a0224461b2ee90 - platform/frameworks/base

commit	e94f05019c94b04c92d2b89190a0224461b2ee90	[log] [tgz]
author	Santos Cordon <santoscordon@google.com>	Fri Feb 24 12:31:20 2017 -0800
committer	Santos Cordon <santoscordon@google.com>	Mon Mar 06 13:51:01 2017 -0800
tree	2d4e063c69d6caf69a1a2f0126e6ebd7db50d18b
parent	d7f52c1b7644396388b9c63a403dd9cb745d91f0 [diff]

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

api/current.txt[diff]
api/system-current.txt[diff]
api/test-current.txt[diff]
core/java/android/os/BatteryStats.java[diff]
core/java/android/view/Display.java[diff]
core/java/com/android/internal/os/BatteryStatsImpl.java[diff]

6 files changed

tree: 2d4e063c69d6caf69a1a2f0126e6ebd7db50d18b