diff options
| author | 2025-03-03 13:58:56 -0800 | |
|---|---|---|
| committer | 2025-03-03 13:58:56 -0800 | |
| commit | 6316f2f53b580fd0d71307dba97b7207726109bf (patch) | |
| tree | 692f5657f3b6a1d8f67a3b14d4a8e4f923ed5f17 | |
| parent | 6c39ed98572a3cbf05535b21d106a2dfb402b54c (diff) | |
| parent | 2145a560fc739a4413c4d578e68675195284151a (diff) | |
RESTRICT AUTOMERGE Add missing preconditions to get/setDefaultApplicationAsUser am: 2145a560fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/31593612
Change-Id: I86e96bfc433a0b68223541f2a96b09981fdf4e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | service/java/com/android/role/RoleService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/service/java/com/android/role/RoleService.java b/service/java/com/android/role/RoleService.java index 485be4e72..6568c2fa7 100644 --- a/service/java/com/android/role/RoleService.java +++ b/service/java/com/android/role/RoleService.java @@ -55,6 +55,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.infra.AndroidFuture; import com.android.internal.util.Preconditions; import com.android.internal.util.dump.DualDumpOutputStream; +import com.android.modules.utils.build.SdkLevel; import com.android.permission.compat.UserHandleCompat; import com.android.permission.util.ArrayUtils; import com.android.permission.util.CollectionUtils; @@ -483,6 +484,9 @@ public class RoleService extends SystemService implements RoleUserState.Callback @Override @Nullable public String getDefaultApplicationAsUser(@NonNull String roleName, @UserIdInt int userId) { + // The MANAGE_DEFAULT_APPLICATIONS permission is only available on U+ + Preconditions.checkState(SdkLevel.isAtLeastU(), + "This API is only available on Android 34 and above"); UserUtils.enforceCrossUserPermission(userId, false, "getDefaultApplicationAsUser", getContext()); if (!UserUtils.isUserExistent(userId, getContext())) { @@ -508,6 +512,9 @@ public class RoleService extends SystemService implements RoleUserState.Callback public void setDefaultApplicationAsUser(@NonNull String roleName, @Nullable String packageName, @RoleManager.ManageHoldersFlags int flags, @UserIdInt int userId, @NonNull RemoteCallback callback) { + // The MANAGE_DEFAULT_APPLICATIONS permission is only available on U+ + Preconditions.checkState(SdkLevel.isAtLeastU(), + "This API is only available on Android 34 and above"); UserUtils.enforceCrossUserPermission(userId, false, "setDefaultApplicationAsUser", getContext()); if (!UserUtils.isUserExistent(userId, getContext())) { |