OSDN Git Service

Fix minor issues discovered with Multi-Display tests
authorAndrii Kulian <akulian@google.com>
Fri, 11 Nov 2016 19:14:12 +0000 (11:14 -0800)
committerAndrii Kulian <akulian@google.com>
Tue, 15 Nov 2016 18:29:25 +0000 (18:29 +0000)
commit03c403d273e1c265b141504a44da22bae48a4493
tree9e0989ec0d917eb8bbc600a3b64c08cbcc218c66
parent53ad29fe532c4865d5984b8e5cd926325cfe63e0
Fix minor issues discovered with Multi-Display tests

- NPE when launching activity on secondary display
and there is a docked stack on primary.
- Activities not finished correctly on secondary display
when it is removed.

Change-Id: If527211e8192088790d32b9673b960535e27033f
Test: See ActivityManagerDisplayTests.
services/core/java/com/android/server/am/ActivityStackSupervisor.java
services/core/java/com/android/server/am/ActivityStarter.java
services/core/java/com/android/server/wm/DisplayContent.java