commit 154535317eaa84a50d70cb3af8697ab4e2c89a25
author Calin Juravle <calin@google.com> Mon Oct 16 22:26:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 16 22:26:06 2017 +0000
tree 0db171110c72d6589eb1b8b4d509332a9131fd70
parent 9e93a6515eae3cb85dee83ebf57509fae219c68d
parent 4a4a4e8e186a0030126002eaa7f74010e1b23810

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

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

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index f111db1..4540d2d 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -856,15 +856,8 @@
 
                         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);
                         }
                     }
                 }