From 366542b94e4b0ae6e300326ac8b866f8b165cfa8 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 15 Dec 2020 18:22:51 -0800 Subject: [PATCH] Add missing permission annotation 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 --- core/api/current.txt | 2 +- core/java/android/app/WallpaperManager.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index a95ce8b59197d..7b6d063180055 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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); diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index ab0901da632f1..a866082896a94 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -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);