diff options
author | 2023-09-20 18:03:08 -0700 | |
---|---|---|
committer | 2023-09-22 22:23:22 +0000 | |
commit | 6ef68c67bd2961e117631bbbb6ba1b3fdcab32b0 (patch) | |
tree | 4c55f0fdd21680a384e1993284e58291e7b51b2f | |
parent | d9c949baa49be81c8fd7720e4248bee3313251d4 (diff) |
Allow to specify the packageName in setDefaultApplication to be null.
Relnote: N/A
Test: m
Change-Id: I986f36501b075fcbaaa3a124cdd6fdfa8e5c4f93
(cherry picked from commit 906b64dd3bcf58aecc876a689f492b26d4faf707)
-rw-r--r-- | framework-s/java/android/app/role/RoleManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework-s/java/android/app/role/RoleManager.java b/framework-s/java/android/app/role/RoleManager.java index de697f801..5b927084d 100644 --- a/framework-s/java/android/app/role/RoleManager.java +++ b/framework-s/java/android/app/role/RoleManager.java @@ -527,8 +527,8 @@ public final class RoleManager { public void setDefaultApplication(@NonNull String roleName, @Nullable String packageName, @ManageHoldersFlags int flags, @CallbackExecutor @NonNull Executor executor, @NonNull Consumer<Boolean> callback) { + // Prior to Android V some devices might require the "packageName" to be non-null. Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); - Preconditions.checkStringNotEmpty(packageName, "packageName cannot be null or empty"); Objects.requireNonNull(executor, "executor cannot be null"); Objects.requireNonNull(callback, "callback cannot be null"); try { |