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

Commit 627ff7fd authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "Handle non-exist permission group correctly for pm list permissions" am: 68872927 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734914



Change-Id: Ibe788cb7146d2981ae44561c5887b6c644fe6a3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a426efb 68872927

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3516,7 +3516,7 @@ class PackageManagerShellCommand extends ShellCommand { 
            }

            }

            List<PermissionInfo> ps = mPermissionManager

            List<PermissionInfo> ps = mPermissionManager

                    .queryPermissionsByGroup(groupList.get(i), 0 /*flags*/);

                    .queryPermissionsByGroup(groupList.get(i), 0 /*flags*/);

            final int count = ps.size();

            final int count = (ps == null ? 0 : ps.size());

            boolean first = true;

            boolean first = true;

            for (int p = 0 ; p < count ; p++) {

            for (int p = 0 ; p < count ; p++) {

                PermissionInfo pi = ps.get(p);

                PermissionInfo pi = ps.get(p);