OSDN Git Service

Merge "Ensure that a PIP activity gets stopped before MW/PIP mode changes." into...
authorWinson Chung <winsonc@google.com>
Sat, 8 Apr 2017 00:30:30 +0000 (00:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 8 Apr 2017 00:30:34 +0000 (00:30 +0000)
commit7ddf4b3e1159d3144b01b422012992d0a30de563
treeed861bbf5dda1d00140fb1360e04f0236145b70e
parente79081aeaa5c81898326a7e5eda3bddb1f47446b
parent47900650862232c0a9a01045041daaadd60765ac
Merge "Ensure that a PIP activity gets stopped before MW/PIP mode changes." into oc-dev
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java