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

Commit 0233aee8 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Fixed NPE in ResourceManager when Activity.recreate is called."

parents 456bca5f 93f543ca

core/java/android/app/ActivityThread.java

+1 −0
Original line number Diff line number Diff line
@@ -3863,6 +3863,7 @@ public final class ActivityThread { 
                    ActivityClientRecord existing = mActivities.get(token);

                    if (existing != null) {

                        target.startsNotResumed = existing.paused;

                        target.overrideConfig = existing.overrideConfig;

                    }

                    target.onlyLocalRequest = true;

                }

core/java/android/app/ResourcesManager.java

+3 −2
Original line number Diff line number Diff line
@@ -117,8 +117,9 @@ public class ResourcesManager { 
     * @param overrideConfiguration override configurations.

     */

    public Display getAdjustedDisplay(final int displayId, Configuration overrideConfiguration) {

        final Pair<Integer, Configuration> key =

                Pair.create(displayId, new Configuration(overrideConfiguration));

        final Configuration configCopy = (overrideConfiguration != null)

                ? new Configuration(overrideConfiguration) : new Configuration();

        final Pair<Integer, Configuration> key = Pair.create(displayId, configCopy);

        synchronized (this) {

            WeakReference<Display> wd = mDisplays.get(key);

            if (wd != null) {