Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34698fa8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "getOrCreatePendingTransaction() is occur NullPointerException caused... 

Merge "getOrCreatePendingTransaction() is occur NullPointerException caused the android reboot" into main
parents bd13ecfb 7717a9e8

services/core/java/com/android/server/wm/RootWindowContainer.java

+1 −1
Original line number Diff line number Diff line
@@ -2496,7 +2496,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                    // Kick off any lingering app transitions form the MoveTaskToFront operation,

                    // but only consider the top activity on that display.

                    rootTask.executeAppTransition(targetOptions);

                } else {

                } else if (topRunningActivity.attachedToProcess()) {

                    resumedOnDisplay[0] |= topRunningActivity.makeActiveIfNeeded(target);

                }

            });