| commit | 3198da4283b42443a43a78c424303bb272a86e42 | [log] [tgz] |
|---|---|---|
| author | Wale Ogunwale <ogunwale@google.com> | Thu Oct 10 14:45:03 2019 +0200 |
| committer | Wale Ogunwale <ogunwale@google.com> | Sat Oct 12 21:04:27 2019 +0200 |
| tree | 609e2ddbdd5e13cf327f60b86ae8f5705cdf3cd7 | |
| parent | 1a06f153563cdb03559821bd0f9771427a7c1570 [diff] [blame] |
Make Task have type ActivityRecord children (55/n) ActivityRecord now extends AppWindowToken and changing Task to have type ActivityRecord children will make the Task level merging easier. Bug: 80414790 Test: Existing tests pass Change-Id: I331ffe054d942cc5dd58bff369fa890b130a45f4
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index a261341..80a295d 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -1420,7 +1420,7 @@ mReparenting = true; getParent().removeChild(this); - task.addChild(this, position); + task.addChild((ActivityRecord) this, position); mReparenting = false;