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

Commit 930da5ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Better error message in case of multiple splits." into udc-dev am: 413bb027 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23179125



Change-Id: Ic7e43cac4cc37b04defb316e6849fc2c99cbee4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5697793c 413bb027

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+31 −27
Original line number Original line Diff line number Diff line
@@ -185,7 +185,10 @@ public class ApkLiteParseUtils { 
        Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parseApkLite");

        Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parseApkLite");

        try {

        try {

            for (File file : files) {

            for (File file : files) {

                if (isApkFile(file)) {

                if (!isApkFile(file)) {

                    continue;

                }



                final ParseResult<ApkLite> result = parseApkLite(input, file, flags);

                final ParseResult<ApkLite> result = parseApkLite(input, file, flags);

                if (result.isError()) {

                if (result.isError()) {

                    return input.error(result);

                    return input.error(result);
@@ -210,12 +213,13 @@ public class ApkLiteParseUtils { 
                    }

                    }

                }

                }





                    // Assert that each split is defined only oncuses-static-libe

                // Assert that each split is defined only once

                    if (apks.put(lite.getSplitName(), lite) != null) {

                ApkLite prev = apks.put(lite.getSplitName(), lite);

                if (prev != null) {

                    return input.error(PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST,

                    return input.error(PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST,

                            "Split name " + lite.getSplitName()

                            "Split name " + lite.getSplitName()

                                        + " defined more than once; most recent was " + file);

                                    + " defined more than once; most recent was " + file

                    }

                                    + ", previous was " + prev.getPath());

                }

                }

            }

            }

            baseApk = apks.remove(null);

            baseApk = apks.remove(null);