Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix PackagePartitions contains null check" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-10 20:30:07 +00:00
committed by Android (Google) Code Review
parent e59c7e4618 6bdadaf0a0
commit ca4709a9a5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/pm/PackagePartitions.java
View File

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