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

Commit 57c45562 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Add null-check when adding starting window"

parents 1b9c8589 70176432

services/core/java/com/android/server/am/ActivityRecord.java

+3 −0
Original line number Diff line number Diff line
@@ -1802,6 +1802,9 @@ final class ActivityRecord implements AppWindowContainerListener { 
    }



    void showStartingWindow(ActivityRecord prev, boolean newTask, boolean taskSwitch) {

        if (mWindowContainerController == null) {

            return;

        }

        final CompatibilityInfo compatInfo =

                service.compatibilityInfoForPackageLocked(info.applicationInfo);

        final boolean shown = mWindowContainerController.addStartingWindow(packageName, theme,