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

Commit ddc1c495 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary @Deprecated on parameter of deprecated method" into... 

Merge "Remove unnecessary @Deprecated on parameter of deprecated method" into main am: e1c5b52a am: 6d0fbbcb

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



Change-Id: Ic2755ae7ccaae8e4f147008da4312292add79337
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c1255de 6d0fbbcb

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

+1 −1
Original line number Diff line number Diff line
@@ -9344,7 +9344,7 @@ public class DevicePolicyManager { 
    @Deprecated

    @SystemApi

    @RequiresPermission(MANAGE_DEVICE_ADMINS)

    public boolean setActiveProfileOwner(@NonNull ComponentName admin, @Deprecated String ownerName)

    public boolean setActiveProfileOwner(@NonNull ComponentName admin, String ownerName)

            throws IllegalArgumentException {

        throwIfParentInstance("setActiveProfileOwner");

        if (mService != null) {