Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 47b1f54316

Change-Id: Ie04409229e2f118f1785db46e2c6f3fb0aa7603e
This commit is contained in:
Jeff Hao
2017-06-15 23:53:47 +00:00
committed by android-build-merger
parent 7076de2d52 47b1f54316
commit 2783f272b6
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -856,8 +856,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
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);
}
}
}
}