OSDN Git Service

Merge "Revert "Fix VR interaction with screen on/off/lockscreen.""
authorJorim Jaggi <jjaggi@google.com>
Thu, 15 Dec 2016 19:50:10 +0000 (19:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 15 Dec 2016 19:50:13 +0000 (19:50 +0000)
commit854e46bd087dcac6c4b8adc2fec007e48784f79e
treee9afb8551753cef69ed6965045ed97f08bfce370
parent354fe934d647a80f2ac3eef789ebcfc407580f47
parentbbb5b6e8db346df613c15447c0697def8a76584d
Merge "Revert "Fix VR interaction with screen on/off/lockscreen.""
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/policy/PhoneWindowManager.java
services/core/java/com/android/server/vr/VrManagerService.java