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

Commit 27639484 authored by Jeff Hao's avatar Jeff Hao Committed by android-build-merger
Browse files

Merge "When updating a split app, copy compiled files from base.apk only." am:... 

Merge "When updating a split app, copy compiled files from base.apk only." am: 8a945baf am: 47b1f543
am: 2783f272

Change-Id: Id7236590276201928ba8abab549f3175d616a7bc
parents 541b56c2 2783f272

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

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




                        mResolvedInstructionSets.add(archSubDir.getName());

                        mResolvedInstructionSets.add(archSubDir.getName());

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

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

                        if (!oatFiles.isEmpty()) {



                            mResolvedInheritedFiles.addAll(oatFiles);

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

                            }

                        }

                        }

                    }

                    }

                }

                }