summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-05-29 13:22:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-05-29 13:22:27 +0000
commitd220529254c319dba900258f13ba8441f7262eaa (patch)
tree814d6b84c97210d74e4d345af429010b61c46caa
parent6182e318510d28bd8b07520f3e88f3d238628d51 (diff)
parent4da9c2097d9016515cd533489294ec25fd4bb12d (diff)
Merge "Add DPC restriction for INTERACT_ACROSS_PROFILES to javadoc." into rvc-dev
-rw-r--r--core/java/android/content/pm/CrossProfileApps.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/content/pm/CrossProfileApps.java b/core/java/android/content/pm/CrossProfileApps.java
index 99e6d91a61ae..3b6740ef7343 100644
--- a/core/java/android/content/pm/CrossProfileApps.java
+++ b/core/java/android/content/pm/CrossProfileApps.java
@@ -277,10 +277,11 @@ public class CrossProfileApps {
*
* <p>Specifically, returns whether the following are all true:
* <ul>
- * <li>{@code UserManager#getEnabledProfileIds(int)} ()} returns at least one other profile for
- * the calling user.</li>
+ * <li>{@code UserManager#getEnabledProfileIds(int)} returns at least one other profile for the
+ * calling user.</li>
* <li>The calling app has requested
* {@code android.Manifest.permission.INTERACT_ACROSS_PROFILES} in its manifest.</li>
+ * <li>The calling app is not a profile owner within the profile group of the calling user.</li>
* </ul>
*
* <p>Note that in order for the user to be able to grant the consent, the requesting package