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

Commit d37ded95 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Revert "When updating a split app, copy compiled files from base.apk... 

Merge "Revert "When updating a split app, copy compiled files from base.apk only."" am: 15453531 am: 4a692615
am: f3ef1f09

Change-Id: I0fff716c3dcc1ce699666b4cd0794930c188400b
parents 644419ff f3ef1f09

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

+2 −9
Original line number Diff line number Diff line
@@ -1134,15 +1134,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 


                        mResolvedInstructionSets.add(archSubDir.getName());

                        List<File> oatFiles = Arrays.asList(archSubDir.listFiles());



                        // Only add compiled files associated with the base.

                        // Once b/62269291 is resolved, we can add all compiled files again.

                        for (File oatFile : oatFiles) {

                            if (oatFile.getName().equals("base.art")

                                    || oatFile.getName().equals("base.odex")

                                    || oatFile.getName().equals("base.vdex")) {

                                mResolvedInheritedFiles.add(oatFile);

                            }

                        if (!oatFiles.isEmpty()) {

                            mResolvedInheritedFiles.addAll(oatFiles);

                        }

                    }

                }