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

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

Merge "Fix NPE when config is updated before ViewRootImpl is set"

parents 7a723d90 ce1ecf1f

core/java/android/app/ActivityThread.java

+6 −2
Original line number Diff line number Diff line
@@ -5070,7 +5070,9 @@ public final class ActivityThread { 


            performConfigurationChangedForActivity(r, mCompatConfiguration, displayId,

                    true /* movedToDifferentDisplay */);

            if (viewRoot != null) {

                viewRoot.onMovedToDisplay(displayId);

            }

        } else {

            if (DEBUG_CONFIGURATION) Slog.v(TAG, "Handle activity config changed: "

                    + r.activityInfo.name + ", config=" + data.overrideConfig);
@@ -5078,7 +5080,9 @@ public final class ActivityThread { 
        }

        // Notify the ViewRootImpl instance about configuration changes. It may have initiated this

        // update to make sure that resources are updated before updating itself.

        if (viewRoot != null) {

            viewRoot.updateConfiguration();

        }

        mSomeActivitiesChanged = true;

    }