OSDN Git Service

Merge "Clean up activity/stack associations." into oc-dev
authorBryce Lee <brycelee@google.com>
Tue, 4 Apr 2017 03:01:46 +0000 (03:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Apr 2017 03:01:50 +0000 (03:01 +0000)
commit9f467df80493159c2a367ef8d08c79a14a7d52aa
tree9e3ef6b56de19f1bf48eaaf25e292eace88a9e9f
parent641691901e743e52f7b69fc253e5bbe4eda88d89
parentaf691c0be7bbfea63e880dd717c51a38a0bc874a
Merge "Clean up activity/stack associations." into oc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
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
services/core/java/com/android/server/am/TaskRecord.java
services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java