summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2023-12-12 13:04:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-12 13:04:25 +0000
commite1c5b52a88c99facd1794e0b4e044298370babbe (patch)
tree7711d39e93085b21b8e1219b0a11f0c77e441f97
parent09b835e6864e93cbe384ee66f7dcbcca2bd37cfa (diff)
parent0d7eebc9f1cf1baac89c68a76ece539572d73b3b (diff)
Merge "Remove unnecessary @Deprecated on parameter of deprecated method" into main
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
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) {