diff options
| author | Robin Lee <rgl@google.com> | 2015-05-01 12:57:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 12:57:37 +0000 |
| commit | 6e761c5d6b8ed2126c6544ce32db569203c46e2a (patch) | |
| tree | eb28c6827800c8c938ee9cd21145fff8667d8956 /core/java | |
| parent | a78240ba5f891c3fd0acb62a1b13b6dc1bbe9705 (diff) | |
| parent | ddd553f2aee4f3821a2f17636bb86d9fa5af9bd7 (diff) | |
| download | frameworks_base-6e761c5d6b8ed2126c6544ce32db569203c46e2a.zip frameworks_base-6e761c5d6b8ed2126c6544ce32db569203c46e2a.tar.gz frameworks_base-6e761c5d6b8ed2126c6544ce32db569203c46e2a.tar.bz2 | |
Merge "Device policy: use owner label instead of name" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index cf9813f..9f71ea5 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2926,7 +2926,7 @@ public class DevicePolicyManager { * the user has already been set up. */ @SystemApi - public boolean setActiveProfileOwner(ComponentName admin, String ownerName) + public boolean setActiveProfileOwner(ComponentName admin, @Deprecated String ownerName) throws IllegalArgumentException { if (mService != null) { try { @@ -2992,8 +2992,8 @@ public class DevicePolicyManager { * @throws IllegalArgumentException if admin is null, the package isn't installed, or the * preconditions mentioned are not met. */ - public boolean setProfileOwner(ComponentName admin, String ownerName, int userHandle) - throws IllegalArgumentException { + public boolean setProfileOwner(ComponentName admin, @Deprecated String ownerName, + int userHandle) throws IllegalArgumentException { if (admin == null) { throw new NullPointerException("admin cannot be null"); } |