diff options
| author | 2023-12-19 07:08:29 +0000 | |
|---|---|---|
| committer | 2023-12-19 07:08:29 +0000 | |
| commit | cf6ed87de2bb56d108c1efea5efad2087f093628 (patch) | |
| tree | 9852330476a0ec631f77524d89d6b57ee36cfa3d | |
| parent | cc8c3ecb05e6355a4aec7394c8aa6a54f01b9913 (diff) | |
| parent | ce4a43498f694fc5f85fbf684b312713f1840520 (diff) | |
Merge "Fix odm privapp permissions" into main am: ce4a43498f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873695
Change-Id: I0f7dd4b77c0f3535d6130b160076f14e865f290a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java | 4 |
1 files changed, 2 insertions, 2 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 21446549cfbd..574f121b033a 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -3379,7 +3379,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt final PermissionAllowlist permissionAllowlist = SystemConfig.getInstance().getPermissionAllowlist(); final String packageName = packageState.getPackageName(); - if (packageState.isVendor()) { + if (packageState.isVendor() || packageState.isOdm()) { return permissionAllowlist.getVendorPrivilegedAppAllowlistState(packageName, permissionName); } else if (packageState.isProduct()) { @@ -3474,7 +3474,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt // the permission's protectionLevel does not have the extra 'vendorPrivileged' // flag. if (allowed && isPrivilegedPermission && !bp.isVendorPrivileged() - && pkgSetting.isVendor()) { + && (pkgSetting.isVendor() || pkgSetting.isOdm())) { Slog.w(TAG, "Permission " + permissionName + " cannot be granted to privileged vendor apk " + pkg.getPackageName() + " because it isn't a 'vendorPrivileged' permission."); |