Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing permission annotation

Browse Source 
Methods that read the wallpaper need READ_EXTERNAL_STORAGE permission.
For some reason we forgot to annotate this method when getFastDrawable()
and getWallpaperFile() were annotated.

Test: make
Fixes: 136457450
Change-Id: I8dec025f35446f4a27b1c43dc249a8078478eeef
This commit is contained in:
Lucas Dupin
2020-12-15 18:22:51 -08:00
parent 7fe5eeefc0
commit 366542b94e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -6731,7 +6731,7 @@ package android.app {
method public android.content.Intent getCropAndSetWallpaperIntent(android.net.Uri);
method public int getDesiredMinimumHeight();
method public int getDesiredMinimumWidth();
method public android.graphics.drawable.Drawable getDrawable();
method @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable getDrawable();
method @RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) public android.graphics.drawable.Drawable getFastDrawable();
method public static android.app.WallpaperManager getInstance(android.content.Context);
method @Nullable public android.app.WallpaperColors getWallpaperColors(int);

1
core/java/android/app/WallpaperManager.java
View File

@@ -605,6 +605,7 @@ public class WallpaperManager {
* or {@code null} if no system wallpaper exists or if the calling application
* is not able to access the wallpaper.
*/
@RequiresPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE)
public Drawable getDrawable() {
final ColorManagementProxy cmProxy = getColorManagementProxy();
Bitmap bm = sGlobals.peekWallpaperBitmap(mContext, true, FLAG_SYSTEM, cmProxy);