From 9a9d8a58409f9bef294b432ed670c0bf8b607ebc Mon Sep 17 00:00:00 2001 From: Aleks Todorov Date: Wed, 3 Nov 2021 15:35:24 +0000 Subject: [PATCH] Fix DevicePolicyManager#getDefaultCrossProfilePackages referring to user consent. Test: Javadoc-only change Bug: 174846503 Change-Id: I7a40dba79e89d56a034fcf51cbb32598a5e3d71c --- core/java/android/app/admin/DevicePolicyManager.java | 4 ++-- .../android/app/admin/DevicePolicyManagerInternal.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 84bb9c62a4615..ac92180e73096 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -13327,8 +13327,8 @@ public class DevicePolicyManager { } /** - * Returns the default package names set by the OEM that are allowed to request user consent for - * cross-profile communication without being explicitly enabled by the admin, via {@link + * Returns the default package names set by the OEM that are allowed to communicate + * cross-profile without being explicitly enabled by the admin, via {@link * com.android.internal.R.array#cross_profile_apps} and {@link com.android.internal.R.array * #vendor_cross_profile_apps}. * diff --git a/core/java/android/app/admin/DevicePolicyManagerInternal.java b/core/java/android/app/admin/DevicePolicyManagerInternal.java index a0d2977cf09a9..8e8c035187d04 100644 --- a/core/java/android/app/admin/DevicePolicyManagerInternal.java +++ b/core/java/android/app/admin/DevicePolicyManagerInternal.java @@ -200,10 +200,10 @@ public abstract class DevicePolicyManagerInternal { public abstract List getAllCrossProfilePackages(); /** - * Returns the default package names set by the OEM that are allowed to request user consent for - * cross-profile communication without being explicitly enabled by the admin, via - * {@link com.android.internal.R.array#cross_profile_apps} and - * {@link com.android.internal.R.array#vendor_cross_profile_apps}. + * Returns the default package names set by the OEM that are allowed to communicate + * cross-profile without being explicitly enabled by the admin, via {@link + * com.android.internal.R.array#cross_profile_apps} and {@link + * com.android.internal.R.array#vendor_cross_profile_apps}. * * @hide */