OSDN Git Service

Merge "Restrict launching activities on virtual displays" into oc-dev
authorAndrii Kulian <akulian@google.com>
Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)
commitcd02bf1676811332d5b26fabab4bd7b5155a4a26
tree5df0b05881291f478b103ef63d922276cad3b495
parent22f0dfcff53abeb59153ceb287879f3dcaed1141
parentb0c5d67bf170648dad9be4df8e4b54fbb9877990
Merge "Restrict launching activities on virtual displays" into oc-dev
am: b0c5d67bf1

Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30
services/core/java/com/android/server/am/ActivityStackSupervisor.java