Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18555351 Change-Id: Ibea90b780f825f3cf050ebbdc30ec7b5ae18715b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -220,6 +220,11 @@ public class StartingSurfaceController {
|
||||
// Attempt to add starting window from the top-most activity.
|
||||
for (int i = mDeferringAddStartActivities.size() - 1; i >= 0; --i) {
|
||||
final DeferringStartingWindowRecord next = mDeferringAddStartActivities.get(i);
|
||||
if (next.mDeferring.getTask() == null) {
|
||||
Slog.e(TAG, "No task exists: " + next.mDeferring.shortComponentName
|
||||
+ " parent: " + next.mDeferring.getParent());
|
||||
continue;
|
||||
}
|
||||
next.mDeferring.showStartingWindow(next.mPrev, mInitNewTask, mInitTaskSwitch,
|
||||
mInitProcessRunning, true /* startActivity */, next.mSource, topOptions);
|
||||
// If one succeeds, it is done.
|
||||
|
||||
Reference in New Issue
Block a user