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

Commit df24328f authored by Felka Chang's avatar Felka Chang Committed by Android (Google) Code Review
Browse files

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

parents 6d3144be 819ab25c

services/core/java/com/android/server/pm/InstallPackageHelper.java

+6 −5
Original line number Diff line number Diff line
@@ -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);

                    }