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

Commit 29e7f36b authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Automerger Merge Worker
Browse files

Merge "Allow pre-R apps to test compressed ARSC error" into rvc-dev am: e3c40062 

Change-Id: Iec2d9a91e6794ab63bbc9b3f21b3b2ae8c4c7c16
parents f4e0144e e3c40062

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

+4 −5
Original line number Diff line number Diff line
@@ -346,12 +346,11 @@ public class ParsingPackageUtils { 
            }



            final ParsingPackage pkg = result.getResult();

            if (pkg.getTargetSdkVersion() >= Build.VERSION_CODES.R

                    && assets.containsAllocatedTable()) {

            if (assets.containsAllocatedTable()) {

                final ParseResult<?> deferResult = input.deferError(

                        "Targeting R+ (version" + Build.VERSION_CODES.R + " and above) requires the"

                                + " resources.arsc of installed APKs to be stored uncompressed and"

                                + " aligned on a 4-byte boundary",

                        "Targeting R+ (version " + Build.VERSION_CODES.R + " and above) requires"

                                + " the resources.arsc of installed APKs to be stored uncompressed"

                                + " and aligned on a 4-byte boundary",

                        DeferredError.RESOURCES_ARSC_COMPRESSED);

                if (deferResult.isError()) {

                    return input.error(INSTALL_PARSE_FAILED_RESOURCES_ARSC_COMPRESSED,