Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c66da723 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Update javadoc for getParentProfileInstance()" into main

parents ee8419e9 e06662ee

core/java/android/app/admin/DevicePolicyManager.java

+2 −7
Original line number Diff line number Diff line
@@ -14453,7 +14453,7 @@ public class DevicePolicyManager { 
     * </ul>

     * <p>

     * The following methods are supported for the parent instance but can only be called by the

     * profile owner of a managed profile that was created during the device provisioning flow:

     * profile owner on an <a href="#organization-owned">organization owned</a> managed profile:

     * <ul>

     * <li>{@link #getPasswordComplexity}</li>

     * <li>{@link #setCameraDisabled}</li>
@@ -14461,11 +14461,6 @@ public class DevicePolicyManager { 
     * <li>{@link #setAccountManagementDisabled(ComponentName, String, boolean)}</li>

     * <li>{@link #setPermittedInputMethods}</li>

     * <li>{@link #getPermittedInputMethods}</li>

     * </ul>

     *

     * <p>The following methods can be called by the profile owner of a managed profile

     * on an organization-owned device:

     * <ul>

     * <li>{@link #wipeData}</li>

     * </ul>

     *