diff options
| author | Esteban Talavera <etalavera@google.com> | 2017-02-07 15:04:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-07 15:04:48 +0000 |
| commit | 84e706fb9b1cd6e3c7e6a4cd97bee6f22732b288 (patch) | |
| tree | be905735ceab0ca8855eeffefb96d36129de88c4 /core/java | |
| parent | 8874d6efdac61fcebcc20d27a3a1fecb3771c886 (diff) | |
| parent | bfb666da53c6ca65ab4c469fc6e2c0631aeaffc0 (diff) | |
Merge "Unhide getLockTaskPackages"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 1913d911b7fe..f1ccabe57e32 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6108,8 +6108,6 @@ public class DevicePolicyManager { * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of * an affiliated user or profile. * @see #setLockTaskPackages - * - * @hide */ public @NonNull String[] getLockTaskPackages(@NonNull ComponentName admin) { throwIfParentInstance("getLockTaskPackages"); |