Merge "[automerger skipped] [RESTRICT AUTOMERGE][pm] prevent system app downgrades of versions lower than preload am: b0be65f929 -s ours am: d97c6fe883 -s ours am: cc2fe134c6 -s ours am: 8bd6c22248 -s ours am: 26082c171d -s ours" into tm-mainline-prod
This commit is contained in:
committed by
Android (Google) Code Review
commit
ccc47f6d2a
@@ -245,9 +245,6 @@ public class ParsingPackageUtils {
|
|||||||
private static final String MAX_NUM_COMPONENTS_ERR_MSG =
|
private static final String MAX_NUM_COMPONENTS_ERR_MSG =
|
||||||
"Total number of components has exceeded the maximum number: " + MAX_NUM_COMPONENTS;
|
"Total number of components has exceeded the maximum number: " + MAX_NUM_COMPONENTS;
|
||||||
|
|
||||||
/** The maximum permission name length. */
|
|
||||||
private static final int MAX_PERMISSION_NAME_LENGTH = 512;
|
|
||||||
|
|
||||||
@IntDef(flag = true, prefix = { "PARSE_" }, value = {
|
@IntDef(flag = true, prefix = { "PARSE_" }, value = {
|
||||||
PARSE_CHATTY,
|
PARSE_CHATTY,
|
||||||
PARSE_COLLECT_CERTIFICATES,
|
PARSE_COLLECT_CERTIFICATES,
|
||||||
@@ -1274,11 +1271,6 @@ public class ParsingPackageUtils {
|
|||||||
// that may change.
|
// that may change.
|
||||||
String name = sa.getNonResourceString(
|
String name = sa.getNonResourceString(
|
||||||
R.styleable.AndroidManifestUsesPermission_name);
|
R.styleable.AndroidManifestUsesPermission_name);
|
||||||
if (TextUtils.length(name) > MAX_PERMISSION_NAME_LENGTH) {
|
|
||||||
return input.error(INSTALL_PARSE_FAILED_MANIFEST_MALFORMED,
|
|
||||||
"The name in the <uses-permission> is greater than "
|
|
||||||
+ MAX_PERMISSION_NAME_LENGTH);
|
|
||||||
}
|
|
||||||
|
|
||||||
int maxSdkVersion = 0;
|
int maxSdkVersion = 0;
|
||||||
TypedValue val = sa.peekValue(
|
TypedValue val = sa.peekValue(
|
||||||
|
|||||||
Reference in New Issue
Block a user