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

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

Merge "[res] Use a more efficient OverlayPath construction" into main

parents 105f0ce3 5715ad81

services/core/java/com/android/server/pm/pkg/PackageUserStateImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ public class PackageUserStateImpl extends WatchableImpl implements PackageUserSt 
        if (mOverlayPaths == null && mSharedLibraryOverlayPaths == null) {

            return null;

        }

        final OverlayPaths.Builder newPaths = new OverlayPaths.Builder();

        newPaths.addAll(mOverlayPaths);

        final OverlayPaths.Builder newPaths = mOverlayPaths == null

                ? new OverlayPaths.Builder() : new OverlayPaths.Builder(mOverlayPaths);

        if (mSharedLibraryOverlayPaths != null) {

            for (final OverlayPaths libOverlayPaths : mSharedLibraryOverlayPaths.values()) {

                newPaths.addAll(libOverlayPaths);