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

Commit 67bdd0f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when mDecor is null on ActivityClientRecord"

parents 4c66f8b2 f903b739

core/java/android/app/ActivityThread.java

+3 −1
Original line number Diff line number Diff line
@@ -5062,7 +5062,9 @@ public final class ActivityThread { 


        // Perform updates.

        r.overrideConfig = data.overrideConfig;

        final ViewRootImpl viewRoot = r.activity.mDecor.getViewRootImpl();

        final ViewRootImpl viewRoot = r.activity.mDecor != null

            ? r.activity.mDecor.getViewRootImpl() : null;



        if (movedToDifferentDisplay) {

            if (DEBUG_CONFIGURATION) Slog.v(TAG, "Handle activity moved to display, activity:"

                    + r.activityInfo.name + ", displayId=" + displayId