From f030a28a6be0ae25285495ee9c6da5ce4b41285d Mon Sep 17 00:00:00 2001 From: Alex Naidis Date: Tue, 3 Jan 2017 18:24:57 +0100 Subject: DefaultPermissionGrantPolicy: Pass correct arguments 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 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 --- .../core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java index 5016ec0d4be0..a6f9243887df 100644 --- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java @@ -1013,7 +1013,7 @@ final class DefaultPermissionGrantPolicy { permissions.clear(); } permissions.add(permissionGrant.name); - grantRuntimePermissionsLPw(pkg, permissions, false, + grantRuntimePermissionsLPw(pkg, permissions, permissionGrant.fixed, userId); } } -- cgit v1.2.3-59-g8ed1b