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

Commit d9be701a authored by Nate Myren's avatar Nate Myren Committed by Nolen Johnson
Browse files

RESTRICT AUTOMERGE Trim permission, permission group names 

Bug: 453649815
Test: atest AppSecurityTests
Flag: EXEMPT CVE_FIX
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:2c0bf3261ca5e09cf8c1cb0de681d6d4c663a20e
Merged-In: I673ad83d05c9825177967e4f0a960e8841610b71
Change-Id: I673ad83d05c9825177967e4f0a960e8841610b71
parent 9eca1d2f

core/java/android/content/pm/parsing/component/ParsedPermissionUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ public class ParsedPermissionUtils { 
            return input.error("<permission> does not specify protectionLevel");

        }



        permission.setName(permission.getName().trim());

        permission.protectionLevel = PermissionInfo.fixProtectionLevel(permission.protectionLevel);



        if (permission.getProtectionFlags() != 0) {
@@ -166,6 +167,7 @@ public class ParsedPermissionUtils { 
                    + permission.getName());

        }



        permission.setName(permission.getName().trim());

        permission.protectionLevel = PermissionInfo.PROTECTION_NORMAL;

        permission.tree = true;
@@ -203,6 +205,7 @@ public class ParsedPermissionUtils { 
            permissionGroup.requestRes = sa.getResourceId(R.styleable.AndroidManifestPermissionGroup_request, 0);

            permissionGroup.flags = sa.getInt(R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags,0);

            permissionGroup.priority = sa.getInt(R.styleable.AndroidManifestPermissionGroup_priority, 0);

            permissionGroup.setName(permissionGroup.getName().trim());

            // @formatter:on

        } finally {

            sa.recycle();