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

Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev

Browse Source
This commit is contained in:
Aemon Cannon
2021-04-28 22:38:41 +00:00
committed by Android (Google) Code Review
parent eaf40f342d 472e9444ac
commit d2317d0fac
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/LoadedApk.java
View File

@@ -463,6 +463,9 @@ public final class LoadedApk {
|| appDir.equals(instrumentedAppDir)) { || appDir.equals(instrumentedAppDir)) {
outZipPaths.clear(); outZipPaths.clear();
outZipPaths.add(instrumentationAppDir); outZipPaths.add(instrumentationAppDir);
if (!instrumentationAppDir.equals(instrumentedAppDir)) {
outZipPaths.add(instrumentedAppDir);
}
// Only add splits if the app did not request isolated split loading. // Only add splits if the app did not request isolated split loading.
if (!aInfo.requestsIsolatedSplitLoading()) { if (!aInfo.requestsIsolatedSplitLoading()) {
@@ -471,7 +474,6 @@ public final class LoadedApk {
} }
if (!instrumentationAppDir.equals(instrumentedAppDir)) { if (!instrumentationAppDir.equals(instrumentedAppDir)) {
outZipPaths.add(instrumentedAppDir);
if (instrumentedSplitAppDirs != null) { if (instrumentedSplitAppDirs != null) {
Collections.addAll(outZipPaths, instrumentedSplitAppDirs); Collections.addAll(outZipPaths, instrumentedSplitAppDirs);
} }