From 2808cbc9d6fa70aebdb9fbb21c8bfb86c929736e Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Wed, 9 May 2018 15:27:43 -0700 Subject: [PATCH] Fix an accidentally reverted condition The conditional was accidentally reversed so bringing it back to the correct state and also bringing back the security exception being thrown on violation. Test: manual bug:67773960 Change-Id: I1223297b8662e94413cc0bdcbe86089d1af296c2 --- .../server/pm/permission/PermissionManagerService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index d3526f7613015..0070ca42d46ce 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -620,9 +620,8 @@ public class PermissionManagerService { enforcePermissionCapLocked(info, tree); bp = new BasePermission(info.name, tree.getSourcePackageName(), BasePermission.TYPE_DYNAMIC); - } else if (bp.isDynamic()) { - // TODO: switch this back to SecurityException - Slog.wtf(TAG, "Not allowed to modify non-dynamic permission " + } else if (!bp.isDynamic()) { + throw new SecurityException("Not allowed to modify non-dynamic permission " + info.name); } changed = bp.addToTree(fixedLevel, info, tree);