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

Commit 93f543ca authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Fixed NPE in ResourceManager when Activity.recreate is called. 

Bug: 19408756
Change-Id: I291badce7fe9a6feaf2a5e8ce1005e6a86b30147
parent 8de86276

core/java/android/app/ActivityThread.java

+1 −0
Original line number Diff line number Diff line
@@ -3867,6 +3867,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) {