Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e06

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18555351

Change-Id: I2d5d7c29b2e6cc301ae5d92e882bc9191af7ba1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2022-08-17 06:53:24 +00:00
committed by Automerger Merge Worker
parent 442888835a 33e3f60e06
commit 9e392e331c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/StartingSurfaceController.java
View File

@@ -220,6 +220,11 @@ public class StartingSurfaceController {
// Attempt to add starting window from the top-most activity. // Attempt to add starting window from the top-most activity.
for (int i = mDeferringAddStartActivities.size() - 1; i >= 0; --i) { for (int i = mDeferringAddStartActivities.size() - 1; i >= 0; --i) {
final DeferringStartingWindowRecord next = mDeferringAddStartActivities.get(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, next.mDeferring.showStartingWindow(next.mPrev, mInitNewTask, mInitTaskSwitch,
mInitProcessRunning, true /* startActivity */, next.mSource, topOptions); mInitProcessRunning, true /* startActivity */, next.mSource, topOptions);
// If one succeeds, it is done. // If one succeeds, it is done.