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

Commit 8e8ec031 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 am: ddc1c495

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



Change-Id: Icc4557f570d88e921d809734e1d1e54bbd1699c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d771903 ddc1c495

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

+1 −1
Original line number Diff line number Diff line
@@ -9381,7 +9381,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) {