diff options
| author | Esteban Talavera <etalavera@google.com> | 2015-08-11 09:40:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-11 09:40:57 +0000 |
| commit | 4dbb37ae95bdf60d230777c6a5e8d53b932e9d40 (patch) | |
| tree | c5c8dbc0b1aa25eae944598fb720c0807f35b4b9 /core | |
| parent | b08c24a3e4f5362bbddc3735802e844e1992cd46 (diff) | |
| parent | 6b8e06495b8bf7a9aeecb8f189fd174fcc457235 (diff) | |
| download | frameworks_base-4dbb37ae95bdf60d230777c6a5e8d53b932e9d40.zip frameworks_base-4dbb37ae95bdf60d230777c6a5e8d53b932e9d40.tar.gz frameworks_base-4dbb37ae95bdf60d230777c6a5e8d53b932e9d40.tar.bz2 | |
Merge "Update setApplicationRestrictions documentation" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index c505b0b..e3414d9 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3204,8 +3204,13 @@ public class DevicePolicyManager { * Called by a profile or device owner to set the application restrictions for a given target * application running in the profile. * - * <p>The provided {@link Bundle} consists of key-value pairs, where the types of values may be - * boolean, int, String, or String[]. + * <p>The provided {@link Bundle} consists of key-value pairs, where the types of values may be: + * <ul> + * <li>{@code boolean} + * <li>{@code int} + * <li>{@code String} or {@code String[]} + * <li>From {@link android.os.Build.VERSION_CODES#M}, {@code Bundle} or {@code Bundle[]} + * </ul> * * <p>The application restrictions are only made visible to the target application and the * profile or device owner. |