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

Commit d2317d0f authored by Aemon Cannon's avatar Aemon Cannon Committed by Android (Google) Code Review
Browse files

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

parents eaf40f34 472e9444

core/java/android/app/LoadedApk.java

+3 −1
Original line number Diff line number Diff line
@@ -463,6 +463,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()) {
@@ -471,7 +474,6 @@ public final class LoadedApk { 
                    }



                    if (!instrumentationAppDir.equals(instrumentedAppDir)) {

                        outZipPaths.add(instrumentedAppDir);

                        if (instrumentedSplitAppDirs != null) {

                            Collections.addAll(outZipPaths, instrumentedSplitAppDirs);

                        }