OSDN Git Service

Merge "Further restrict activity launch on virtual displays" into oc-dev am: 36dbd3d43f
authorAndrii Kulian <akulian@google.com>
Thu, 29 Jun 2017 02:25:33 +0000 (02:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 02:25:33 +0000 (02:25 +0000)
commitaf08c843c63899e777a71b5d8d928db4599a6231
tree30055c4311d54ee55e0d976bc13d2a2919d7a21e
parentc09f11ad3693b28da7ac3914efbd69d19257c75a
parentc8cccd7621d40d9f1d7da80ba5d5ea7282b6d002
Merge "Further restrict activity launch on virtual displays" into oc-dev am: 36dbd3d43f
am: c8cccd7621

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