OSDN Git Service

DefaultPermissionGrantPolicy: Pass correct arguments
authorAlex Naidis <alex.naidis@linux.com>
Tue, 3 Jan 2017 17:24:57 +0000 (18:24 +0100)
committerAlex Naidis <alex.naidis@linux.com>
Fri, 6 Jan 2017 22:21:24 +0000 (22:21 +0000)
After parsing the xml files in the "default-permissions"
system, we are passing the arguments in the wrong order.

The method we are targeting is:
private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions,
            boolean systemFixed, boolean isDefaultPhoneOrSms, int userId) {

However we are passing our argument for "systemFixed"
to "isDefaultPhoneOrSms" and the other way around too.

This patch fixes it by using the version of the method
which takes 4 arguments and sets "isDefaultPhoneOrSms"
as false.

Change-Id: I3604a5d6045aadcd91b6dd3f6f1b47b561403b23
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

index 5016ec0..a6f9243 100644 (file)
@@ -1013,7 +1013,7 @@ final class DefaultPermissionGrantPolicy {
                         permissions.clear();
                     }
                     permissions.add(permissionGrant.name);
-                    grantRuntimePermissionsLPw(pkg, permissions, false,
+                    grantRuntimePermissionsLPw(pkg, permissions,
                             permissionGrant.fixed, userId);
                 }
             }