Merge "Fix javadoc for CrossProfileApps#canRequestInteractAcrossProfiles" into rvc-dev

This commit is contained in:
Kholoud Mohamed
2020-04-23 10:12:36 +00:00
committed by Android (Google) Code Review

View File

@@ -279,12 +279,8 @@ public class CrossProfileApps {
* <ul> * <ul>
* <li>{@code UserManager#getEnabledProfileIds(int)} ()} returns at least one other profile for * <li>{@code UserManager#getEnabledProfileIds(int)} ()} returns at least one other profile for
* the calling user.</li> * the calling user.</li>
* <li>The calling app has requested</li> * <li>The calling app has requested
* {@code android.Manifest.permission.INTERACT_ACROSS_PROFILES} in its manifest. * {@code android.Manifest.permission.INTERACT_ACROSS_PROFILES} in its manifest.</li>
* <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>
* </ul> * </ul>
* *
* <p>Note that in order for the user to be able to grant the consent, the requesting package * <p>Note that in order for the user to be able to grant the consent, the requesting package