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

Commit e770e9f0 authored by Nate Myren's avatar Nate Myren Committed by Android Build Coastguard Worker
Browse files

Trim permission, permission group names 

Bug: 453649815
Test: atest AppSecurityTests
Flag: EXEMPT CVE_FIX
(cherry picked from commit 595cf99ecd42927eebf804638a4623313f3f14db)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:08ea2a452c271ccf258d63efc0126c7fa13d3312
Merged-In: I673ad83d05c9825177967e4f0a960e8841610b71
Change-Id: I673ad83d05c9825177967e4f0a960e8841610b71
parent a4523e22

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

+6 −1
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ public class ParsedPermissionUtils { 
            }

        }



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



        permission.setProtectionLevel(

                PermissionInfo.fixProtectionLevel(permission.getProtectionLevel()));
@@ -199,6 +201,8 @@ public class ParsedPermissionUtils { 
            sa.recycle();

        }



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



        int index = permission.getName().indexOf('.');

        if (index > 0) {

            index = permission.getName().indexOf('.', index + 1);
@@ -248,7 +252,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();