OSDN Git Service

Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
authorJorim Jaggi <jjaggi@google.com>
Tue, 29 Aug 2017 11:32:07 +0000 (11:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 Aug 2017 11:32:07 +0000 (11:32 +0000)
commit54f40fa1e6bdd27e10738d09e1a123ca8c99f412
tree7d0feed0d6daa16b402ba69a07b12d2527468b93
parent55309e79cff3b3a34c16bf034981a1f3143f1733
parent791ccc00aae7647d146646e4c8ec0d5e2f5bd4ed
Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev

* changes:
  Fix transition between two occluding activities
  Use Keyguard orientation when unoccluding
services/core/java/com/android/server/am/ActivityRecord.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java