diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2020-10-05 22:46:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-10-05 22:46:25 +0000 |
| commit | 4b768acc2915f2a7b58bf602ec1105343f973688 (patch) | |
| tree | fa451c618433ae39994e480e5f7d9598927cc942 /core/java | |
| parent | c861b286f1668c6ed6a25b246ca594f540ec49ea (diff) | |
| parent | f1c1fd27b4072945fa295fdb8f3e18a5614e41a4 (diff) | |
Merge "Added WindowManagerWrapper#setProvidesInsetsTypes"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/window/TaskOrganizer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/window/TaskOrganizer.java b/core/java/android/window/TaskOrganizer.java index d8f2bb248fd1..a7cb642b83f9 100644 --- a/core/java/android/window/TaskOrganizer.java +++ b/core/java/android/window/TaskOrganizer.java @@ -39,13 +39,14 @@ public class TaskOrganizer extends WindowOrganizer { private ITaskOrganizerController mTaskOrganizerController; public TaskOrganizer() { - mTaskOrganizerController = getController(); + this(null); } /** @hide */ @VisibleForTesting public TaskOrganizer(ITaskOrganizerController taskOrganizerController) { - mTaskOrganizerController = taskOrganizerController; + mTaskOrganizerController = taskOrganizerController != null + ? taskOrganizerController : getController(); } /** |