diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageInstallerSession.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 5c54ba803a05..f5808affdb9e 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -862,15 +862,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); } } } |