diff options
| author | 2023-12-12 13:32:40 +0000 | |
|---|---|---|
| committer | 2023-12-12 13:32:40 +0000 | |
| commit | 6d0fbbcb2748c9da82d40d86f72fcf101bdb76a0 (patch) | |
| tree | 7711d39e93085b21b8e1219b0a11f0c77e441f97 | |
| parent | 02a76858adf8fae8bd0689cd1834d31ec03c40c1 (diff) | |
| parent | e1c5b52a88c99facd1794e0b4e044298370babbe (diff) | |
Merge "Remove unnecessary @Deprecated on parameter of deprecated method" into main am: e1c5b52a88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2867594
Change-Id: I50b34cc1ddb98fd0f316129713e4c2a7ae3eb53e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9a70522c1406..836dc10154dd 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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) { |