OSDN Git Service

Merge "Add keyguard state as a gate for VR Mode." into oc-mr1-dev am: 3f58b239a2
authorSantos Cordon <santoscordon@google.com>
Sat, 7 Oct 2017 02:54:06 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 7 Oct 2017 02:54:06 +0000 (02:54 +0000)
commit86a36a6c6f78f2dee3f13f2d7456ac55d4bfd39b
tree5a6cae8c6a22973293c644b92866a57ceba6095b
parent8a56855ec438f07a760996b64e39273ac80fe5d4
parentb93cdb494af5110e4da83d4e5782f219567a3e11
Merge "Add keyguard state as a gate for VR Mode." into oc-mr1-dev am: 3f58b239a2
am: b93cdb494a

Change-Id: Ib83b3a1c52977ddda229d3fdf3b55af973a243e1
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/vr/VrManagerService.java