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

Commit 6e356c45 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Android (Google) Code Review
Browse files

Merge "Added a check to avoid adding shared libraries to resources created... 

Merge "Added a check to avoid adding shared libraries to resources created based on system assets" into main
parents 3d4a79d3 c65db1c5

core/java/android/app/ResourcesManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1836,9 +1836,10 @@ public class ResourcesManager { 
                    // have shared library asset paths appended if there are any.

                    if (r.getImpl() != null) {

                        final ResourcesImpl oldImpl = r.getImpl();

                        final AssetManager oldAssets = oldImpl.getAssets();

                        // ResourcesImpl constructor will help to append shared library asset paths.

                        if (oldImpl.getAssets().isUpToDate()) {

                            final ResourcesImpl newImpl = new ResourcesImpl(oldImpl.getAssets(),

                        if (oldAssets != AssetManager.getSystem() && oldAssets.isUpToDate()) {

                            final ResourcesImpl newImpl = new ResourcesImpl(oldAssets,

                                    oldImpl.getMetrics(), oldImpl.getConfiguration(),

                                    oldImpl.getDisplayAdjustments());

                            r.setImpl(newImpl);