summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorEsteban Talavera <etalavera@google.com>2015-08-10 17:26:04 +0100
committerEsteban Talavera <etalavera@google.com>2015-08-10 18:04:10 +0100
commit6b8e06495b8bf7a9aeecb8f189fd174fcc457235 (patch)
tree871532d3e380ba25482f0d2a9f6209ce1f235352 /core
parent7157c2ca81cb2c942a1e94cf1a0344babf6a8bd6 (diff)
downloadframeworks_base-6b8e06495b8bf7a9aeecb8f189fd174fcc457235.zip
frameworks_base-6b8e06495b8bf7a9aeecb8f189fd174fcc457235.tar.gz
frameworks_base-6b8e06495b8bf7a9aeecb8f189fd174fcc457235.tar.bz2
Update setApplicationRestrictions documentation
From M we support nested Bundles in the input parameter Bug: 23076454 Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java9
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 33cbc9d..1e8529a 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3176,8 +3176,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.