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

Commit f058a484 authored by Nate Myren's avatar Nate Myren Committed by Nishith Khanna
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 d341b52e

core/java/com/android/internal/pm/pkg/component/ParsedPermissionUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ public class ParsedPermissionUtils { 
            }

        }



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

        permission.setProtectionLevel(

                PermissionInfo.fixProtectionLevel(permission.getProtectionLevel()));
@@ -200,6 +201,7 @@ public class ParsedPermissionUtils { 
                    + permission.getName());

        }



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

        permission.setProtectionLevel(PermissionInfo.PROTECTION_NORMAL)

                .setTree(true);
@@ -240,7 +242,8 @@ public class ParsedPermissionUtils { 
                    .setBackgroundRequestDetailRes(sa.getResourceId(R.styleable.AndroidManifestPermissionGroup_backgroundRequestDetail, 0))

                    .setRequestRes(sa.getResourceId(R.styleable.AndroidManifestPermissionGroup_request, 0))

                    .setPriority(sa.getInt(R.styleable.AndroidManifestPermissionGroup_priority, 0))

                    .setFlags(sa.getInt(R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags,0));

                    .setFlags(sa.getInt(R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags,0))

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

            // @formatter:on

        } finally {

            sa.recycle();