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

Commit 4c9c8358 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 am: 930da5ad 

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



Change-Id: I07c0afb976563a35a98a6e577a7c1476160b9045
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cda3110 930da5ad

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

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

        try {

            for (File file : files) {

                if (isApkFile(file)) {

                if (!isApkFile(file)) {

                    continue;

                }



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

                if (result.isError()) {

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

                }



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

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

                // Assert that each split is defined only once

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

                if (prev != null) {

                    return input.error(PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST,

                            "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);