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

Commit 0eef2859 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for setManagedSubscriptionsPolicy" into udc-dev am: c0fdac3d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23515474



Change-Id: I7fa2e94eeab433bb2e508e051ae05e95ffe4361c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcd48e33 c0fdac3d

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

+2 −1
Original line number Diff line number Diff line
@@ -11369,7 +11369,8 @@ public class DevicePolicyManager { 
     * @throws SecurityException     if the caller is not a profile owner on an organization-owned

     *                               managed profile.

     * @throws IllegalStateException if called after the device setup has been completed.

     * @throws UnsupportedOperationException if the api is not enabled.

     * @throws UnsupportedOperationException if managed subscriptions policy is not explicitly

     *         enabled by the device policy management role holder during device setup.

     * @see ManagedSubscriptionsPolicy

     */

    public void setManagedSubscriptionsPolicy(@Nullable ManagedSubscriptionsPolicy policy) {