Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5115b1ae authored by Jason O'Brien's avatar Jason O'Brien Committed by Android (Google) Code Review
Browse files

Merge "Add instrumented app to JAR path (isolated splits)"

parents 14f83608 6f2978c9

core/java/android/app/LoadedApk.java

+3 −1
Original line number Diff line number Diff line
@@ -464,6 +464,9 @@ public final class LoadedApk { 
                    || appDir.equals(instrumentedAppDir)) {

                outZipPaths.clear();

                outZipPaths.add(instrumentationAppDir);

                if (!instrumentationAppDir.equals(instrumentedAppDir)) {

                    outZipPaths.add(instrumentedAppDir);

                }



                // Only add splits if the app did not request isolated split loading.

                if (!aInfo.requestsIsolatedSplitLoading()) {
@@ -472,7 +475,6 @@ public final class LoadedApk { 
                    }



                    if (!instrumentationAppDir.equals(instrumentedAppDir)) {

                        outZipPaths.add(instrumentedAppDir);

                        if (instrumentedSplitAppDirs != null) {

                            Collections.addAll(outZipPaths, instrumentedSplitAppDirs);

                        }