commit | 5641feeb6642f1ecd226bde684f24589a30ab408 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 22 00:43:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 22 00:43:46 2020 +0000 |
tree | bbbe97dcfd7659a6dd3dfa9b59a435a76a5c278f | |
parent | f8beb7d6b32b5058bb63b6001c407b5c8bc19f2b [diff] | |
parent | 947905d28b08e6640f5a8fe4cd14e4e3ea85dc45 [diff] |
Merge "Fixing crash when emptyView gets added twice" into ub-launcher3-rvc-dev am: 947905d28b Change-Id: Iae90cf1244b7b36d06beff17d8a3972f4cf5240c
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index eee35d1..b687920 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1098,7 +1098,7 @@ */ public void showCurrentTask(int runningTaskId) { if (getTaskView(runningTaskId) == null) { - boolean wasEmpty = getTaskViewCount() == 0; + boolean wasEmpty = getChildCount() == 0; // Add an empty view for now until the task plan is loaded and applied final TaskView taskView = mTaskViewPool.getView(); addView(taskView, mTaskViewStartIndex);