commit 08b3fd966c926f9925bee09e61018d5172abe6ea
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 15 23:52:01 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 15 23:52:06 2017 +0000
tree 045f58c5d1d84b3db733b6053cb98e06bb996c0d
parent 627fbf8157469c29b90fe0160d64053e6776bd64
parent be649a4ba1014a22ccb7d98319b26472b0e0076d

Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev

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