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

Commit 3979ee87 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not canonicalize overlay config test paths" into sc-dev am: 890daeb0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14908371

Change-Id: Idfd0b5a0d27dbaca145454258c60cfe09faf4dc9
parents 635bec9c 890daeb0

core/java/android/content/pm/PackagePartitions.java

+11 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ public class PackagePartitions { 
        @Nullable

        private final DeferredCanonicalFile mOverlayFolder;



        @NonNull

        private final File mNonConicalFolder;



        private SystemPartition(@NonNull File folder, @PartitionType int type,

                boolean containsPrivApp, boolean containsOverlay) {

            this.type = type;
@@ -128,6 +131,7 @@ public class PackagePartitions { 
                    : null;

            this.mOverlayFolder = containsOverlay ? new DeferredCanonicalFile(folder, "overlay")

                    : null;

            this.mNonConicalFolder = folder;

        }



        public SystemPartition(@NonNull SystemPartition original) {
@@ -136,6 +140,7 @@ public class PackagePartitions { 
            this.mAppFolder = original.mAppFolder;

            this.mPrivAppFolder = original.mPrivAppFolder;

            this.mOverlayFolder = original.mOverlayFolder;

            this.mNonConicalFolder = original.mNonConicalFolder;

        }



        /**
@@ -153,6 +158,12 @@ public class PackagePartitions { 
            return mFolder.getFile();

        }



        /** Returns the non-canonical folder of the partition. */

        @NonNull

        public File getNonConicalFolder() {

            return mNonConicalFolder;

        }



        /** Returns the canonical app folder of the partition. */

        @Nullable

        public File getAppFolder() {

core/java/com/android/internal/content/om/OverlayConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class OverlayConfig { 
            // Rebase the system partitions and settings file on the specified root directory.

            partitions = new ArrayList<>(PackagePartitions.getOrderedPartitions(

                    p -> new OverlayPartition(

                            new File(rootDirectory, p.getFolder().getPath()),

                            new File(rootDirectory, p.getNonConicalFolder().getPath()),

                            p)));

        }