From 2bb81c157578a32e57378106e40f999a685c7bb7 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Wed, 2 Mar 2022 17:34:11 +0000 Subject: [PATCH] Make error message readable. Add space after "permission" to separate the word from the actual permission name. Bug: 217770322 Test: N/A Change-Id: Ib17497c7ce7580e9d866d2c4ca16b335055947f5 (cherry picked from commit 0f6550739404e1671341f3d8159bc2d697471640) Merged-In: Ib17497c7ce7580e9d866d2c4ca16b335055947f5 --- .../server/pm/permission/PermissionManagerServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 9961ae51b92de..90842619c31ec 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1403,7 +1403,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } } else { if (ps.getUserStateOrDefault(userId).isInstantApp() && !bp.isInstant()) { - throw new SecurityException("Cannot grant non-ephemeral permission" + permName + throw new SecurityException("Cannot grant non-ephemeral permission " + permName + " for package " + packageName); } @@ -3532,8 +3532,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt final Boolean granted = SystemConfig.getInstance().getOemPermissions(pkg.getPackageName()).get(permission); if (granted == null) { - throw new IllegalStateException("OEM permission" + permission + " requested by package " - + pkg.getPackageName() + " must be explicitly declared granted or not"); + throw new IllegalStateException("OEM permission " + permission + + " requested by package " + pkg.getPackageName() + + " must be explicitly declared granted or not"); } return Boolean.TRUE == granted; }