OSDN Git Service

Merge changes Iad270dfd,Ice608e6d,I375369a8
authorWinson Chung <winsonc@google.com>
Thu, 2 Feb 2017 00:23:05 +0000 (00:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Feb 2017 00:23:08 +0000 (00:23 +0000)
commitb0412060ea9e982852c0af1a45754ca9449e1f9d
tree406cceccd3640be96c45fd455dda4a10f63625be
parent58f34b828d5276a612447d7a831548b7975f7764
parent14fbe141e0990d423b8564c0fc3a786ed26232c0
Merge changes Iad270dfd,Ice608e6d,I375369a8

* changes:
  Adding initial TRON logging for picture-in-picture.
  Disallow entering PiP when activity is locked.
  Preventing cases where an app can be stopped while entering PiP.
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