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

Merge "Fix NPE on calling Resources.getConfiguration()"

Browse Source
This commit is contained in:
Felka Chang
2022-01-14 04:00:40 +00:00
committed by Android (Google) Code Review
parent 6d3144beae 819ab25c2f
commit df24328f69
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -1969,14 +1969,15 @@ final class InstallPackageHelper {
reconciledPkg.mPrepareResult.mExistingPackage.getPackageName());
if ((reconciledPkg.mInstallArgs.mInstallFlags & PackageManager.DONT_KILL_APP)
== 0) {
if (ps1.getOldCodePaths() == null) {
ps1.setOldCodePaths(new ArraySet<>());
Set<String> oldCodePaths = ps1.getOldCodePaths();
if (oldCodePaths == null) {
oldCodePaths = new ArraySet<>();
}
Collections.addAll(ps1.getOldCodePaths(), oldPackage.getBaseApkPath());
Collections.addAll(oldCodePaths, oldPackage.getBaseApkPath());
if (oldPackage.getSplitCodePaths() != null) {
Collections.addAll(ps1.getOldCodePaths(),
oldPackage.getSplitCodePaths());
Collections.addAll(oldCodePaths, oldPackage.getSplitCodePaths());
}
ps1.setOldCodePaths(oldCodePaths);
} else {
ps1.setOldCodePaths(null);
}