diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-04-30 00:13:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-30 00:13:16 +0000 |
| commit | e3c40062e6c87aedac689896ef2e20559518ec16 (patch) | |
| tree | 2a8957e4fe45dfff569d8435268049991f535980 /core/java | |
| parent | e1adc126a4dff3c81ee5541fb41d7d021ae2a70d (diff) | |
| parent | 72e144cd18094c70769b344d2cbb15f6f5a68f03 (diff) | |
Merge "Allow pre-R apps to test compressed ARSC error" into rvc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/parsing/ParsingPackageUtils.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/content/pm/parsing/ParsingPackageUtils.java b/core/java/android/content/pm/parsing/ParsingPackageUtils.java index 4e189796bc48..197ad7412a1f 100644 --- a/core/java/android/content/pm/parsing/ParsingPackageUtils.java +++ b/core/java/android/content/pm/parsing/ParsingPackageUtils.java @@ -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, |