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

Commit e8c2428c authored by Brandon Liu's avatar Brandon Liu Committed by Android (Google) Code Review
Browse files

Merge "Adding check to validate assets before appending shared library" into main

parents 4540f1b5 a5dbbb09

core/java/android/app/ResourcesManager.java

+9 −4
Original line number Diff line number Diff line
@@ -1745,10 +1745,15 @@ public class ResourcesManager { 
                    if (r.getImpl() != null) {

                        final ResourcesImpl oldImpl = r.getImpl();

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

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

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

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

                                    oldImpl.getDisplayAdjustments());

                            r.setImpl(newImpl);

                        } else {

                            Slog.w(TAG, "Skip appending shared library asset paths for the "

                                    + "Resource as its assets are not up to date.");

                        }

                    }

                }

            }