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

Commit 3aabb7af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix PackagePartitions contains null check" into rvc-dev am: ca4709a9 

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

Change-Id: I84cfaec0da13c7c5e91fc40d6d8ef88f8b8e5cd1
parents ea4427b6 ca4709a9

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

+6 −3
Original line number Diff line number Diff line
@@ -183,17 +183,20 @@ public class PackagePartitions { 


        /** Returns whether the partition contains the specified file in its priv-app folder. */

        public boolean containsPrivApp(@NonNull File scanFile) {

            return FileUtils.contains(mPrivAppFolder.getFile(), canonicalize(scanFile));

            return mPrivAppFolder != null

                    && FileUtils.contains(mPrivAppFolder.getFile(), canonicalize(scanFile));

        }



        /** Returns whether the partition contains the specified file in its app folder. */

        public boolean containsApp(@NonNull File scanFile) {

            return FileUtils.contains(mAppFolder.getFile(), canonicalize(scanFile));

            return mAppFolder != null

                    && FileUtils.contains(mAppFolder.getFile(), canonicalize(scanFile));

        }



        /** Returns whether the partition contains the specified file in its overlay folder. */

        public boolean containsOverlay(@NonNull File scanFile) {

            return FileUtils.contains(mOverlayFolder.getFile(), canonicalize(scanFile));

            return mOverlayFolder != null

                    && FileUtils.contains(mOverlayFolder.getFile(), canonicalize(scanFile));

        }

    }