diff options
| author | Kholoud Mohamed <kholoudm@google.com> | 2020-04-23 10:12:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-23 10:12:36 +0000 |
| commit | 4bf358fe391c8a1076dd1eed725ffdfd0615a5de (patch) | |
| tree | c23a7eb62010e341ba4d88dd41b683c0a3cb9dd8 /core/java/android | |
| parent | c62350d8dc280f0b4d079ac4e0ed627ebc396d25 (diff) | |
| parent | 716cf78bfe6505b7c0152835d243f0aee9ecf58c (diff) | |
Merge "Fix javadoc for CrossProfileApps#canRequestInteractAcrossProfiles" into rvc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/CrossProfileApps.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/java/android/content/pm/CrossProfileApps.java b/core/java/android/content/pm/CrossProfileApps.java index 144a07eb4ea3..99e6d91a61ae 100644 --- a/core/java/android/content/pm/CrossProfileApps.java +++ b/core/java/android/content/pm/CrossProfileApps.java @@ -279,12 +279,8 @@ public class CrossProfileApps { * <ul> * <li>{@code UserManager#getEnabledProfileIds(int)} ()} returns at least one other profile for * the calling user.</li> - * <li>The calling app has requested</li> - * {@code android.Manifest.permission.INTERACT_ACROSS_PROFILES} in its manifest. - * <li>The calling package has either been whitelisted by default by the OEM or has been - * explicitly whitelisted by the admin via - * {@link android.app.admin.DevicePolicyManager#setCrossProfilePackages(ComponentName, Set)}. - * </li> + * <li>The calling app has requested + * {@code android.Manifest.permission.INTERACT_ACROSS_PROFILES} in its manifest.</li> * </ul> * * <p>Note that in order for the user to be able to grant the consent, the requesting package |