OSDN Git Service

Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev
authorWinson Chung <winsonc@google.com>
Thu, 4 May 2017 16:16:28 +0000 (16:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 May 2017 16:16:33 +0000 (16:16 +0000)
commitc5e289d4799db7037ff53ae0e10c0b94e7844088
treec46d8eab06a80730b60b9dcbd8186fe8cd4c951c
parenta20b6ba1f2727501eab7f5c8b34607a0c02b4a74
parente6385a23d7d7e0628544c9751c59507d1df7885c
Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStarter.java