diff options
| author | Nicolas Falliere <nicof@google.com> | 2012-06-18 17:45:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 17:45:40 -0700 |
| commit | 4d2bef3f850e75744ade93f95615c7cb4a7fefa0 (patch) | |
| tree | c00ce4871ecaf2faaea01375120850043185510a /core/java/android/content/Context.java | |
| parent | 3eda1903c709904da9a1668b0ba9c46f13cd9f80 (diff) | |
| parent | 277c09f6c16c4adfd50407e2fa4dbf61a0e06e55 (diff) | |
| download | frameworks_base-4d2bef3f850e75744ade93f95615c7cb4a7fefa0.zip frameworks_base-4d2bef3f850e75744ade93f95615c7cb4a7fefa0.tar.gz frameworks_base-4d2bef3f850e75744ade93f95615c7cb4a7fefa0.tar.bz2 | |
am 277c09f6: am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '277c09f6c16c4adfd50407e2fa4dbf61a0e06e55':
Added or fixed doctrings for required permissions.
Diffstat (limited to 'core/java/android/content/Context.java')
| -rw-r--r-- | core/java/android/content/Context.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 11b4906..2800930 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -813,6 +813,8 @@ public abstract class Context { /** * @deprecated Use {@link android.app.WallpaperManager#setBitmap(Bitmap) * WallpaperManager.set()} instead. + * <p>This method requires the caller to hold the permission + * {@link android.Manifest.permission#SET_WALLPAPER}. */ @Deprecated public abstract void setWallpaper(Bitmap bitmap) throws IOException; @@ -820,6 +822,8 @@ public abstract class Context { /** * @deprecated Use {@link android.app.WallpaperManager#setStream(InputStream) * WallpaperManager.set()} instead. + * <p>This method requires the caller to hold the permission + * {@link android.Manifest.permission#SET_WALLPAPER}. */ @Deprecated public abstract void setWallpaper(InputStream data) throws IOException; @@ -827,6 +831,8 @@ public abstract class Context { /** * @deprecated Use {@link android.app.WallpaperManager#clear * WallpaperManager.clear()} instead. + * <p>This method requires the caller to hold the permission + * {@link android.Manifest.permission#SET_WALLPAPER}. */ @Deprecated public abstract void clearWallpaper() throws IOException; |