diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-02-11 10:51:10 +0000 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2015-03-09 10:39:21 +0000 |
| commit | f3ece36535d4999cf2bfd2175a33da6c3cdf298e (patch) | |
| tree | 3968fb249921a6e7cf86bead062f437991e44070 /core/java/android/os | |
| parent | b3ec733bb830f2d4425825d93f9ed95f284e9145 (diff) | |
| download | frameworks_base-f3ece36535d4999cf2bfd2175a33da6c3cdf298e.zip frameworks_base-f3ece36535d4999cf2bfd2175a33da6c3cdf298e.tar.gz frameworks_base-f3ece36535d4999cf2bfd2175a33da6c3cdf298e.tar.bz2 | |
Block setting wallpapers from managed profiles.
Silently fail when a managed profile app tries to change the
wallpaper and return default values for getters in that case.
This is implemented through a new AppOp that is controlled by
a new user restriction that will be set during provisioning.
Bug: 18725052
Change-Id: I1601852617e738be86560f054daf3435dd9f5a9f
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/UserManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 650f3b3..706e0d0 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -391,6 +391,15 @@ public class UserManager { public static final String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam"; /** + * Hidden user restriction to disallow access to wallpaper manager APIs. This user restriction + * is always set for managed profiles. + * @hide + * @see #setUserRestrictions(Bundle) + * @see #getUserRestrictions() + */ + public static final String DISALLOW_WALLPAPER = "no_wallpaper"; + + /** * Application restriction key that is used to indicate the pending arrival * of real restrictions for the app. * |