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

Commit c1ff12ec authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev

parents 7d2a0a05 8ce4e12c

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.