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

Commit 77acaf86 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Fix issue where existing Activity Resources references would not... 

Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12ec
am: 3297250b

* commit '3297250b':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1f9dfebf5deb3d1a9cf49cc9042a02a90c3c7a68
parents 66741511 3297250b

core/java/android/app/ResourcesManager.java

+2 −9
Original line number Diff line number Diff line
@@ -451,15 +451,8 @@ public class ResourcesManager { 
            }



            synchronized (this) {

                final ActivityResources activityResources =

                        getOrCreateActivityResourcesStructLocked(

                                activityToken);



                if (overrideConfig != null) {

                    activityResources.overrideConfig.setTo(overrideConfig);

                } else {

                    activityResources.overrideConfig.setToDefaults();

                }

                // Force the creation of an ActivityResourcesStruct.

                getOrCreateActivityResourcesStructLocked(activityToken);

            }



            // Update any existing Activity Resources references.