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

Commit 6bdadaf0 authored by Winson's avatar Winson
Browse files

Fix PackagePartitions contains null check 

The subfolders can be null depending on the partition.

Bug: 158671002

Test: manual was tested as part of not yet merged
	Ie09ccf4b64a0be26d19c9034a68ca4877ca49b81

Change-Id: Ic3a07867cb50b6b0b0e265e9540c52ee94c68050
parent a621dad0

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));

        }

    }