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

Commit 0fd8eb23 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Better error message for privapp-permissions test"

parents 086ab848 cd2377c6

services/tests/servicestests/src/com/android/server/pm/PackageManagerPresubmitTest.java

+3 −5
Original line number Diff line number Diff line
@@ -103,12 +103,10 @@ public class PackageManagerPresubmitTest { 
                // if privapp permissions are enforced, platform permissions must be whitelisted

                // in SystemConfig

                if (platformPermission && RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS_ENFORCE) {

                    assertTrue("Permission " + pName

                                    + " should be declared in "

                                    + "/etc/permissions/privapp-permissions-platform.xml "

                                    + "or privapp-permissions-<device>.xml file for package "

                    assertTrue("Permission " + pName + " should be declared in "

                                    + "privapp-permissions-<category>.xml file for package "

                                    + packageName,

                            privAppPermissions.contains(pName));

                            privAppPermissions != null && privAppPermissions.contains(pName));

                }

                assertTrue("Permission " + pName + " should be granted to " + packageName, granted);

            }