From 384071746eb57aa20b3f98b37ed5d0c703f34d42 Mon Sep 17 00:00:00 2001 From: Aurélien Pomini Date: Thu, 27 Jun 2024 12:06:34 +0000 Subject: Revert "Replace legacy StorageManager check" This reverts commit 9d681be67971281833ba2828423a1aa8847fc058. Reason for revert: b/347863055 Change-Id: I655353750b99a7466715ee02d89f6e3f87405c90 --- .../java/com/android/server/wallpaper/WallpaperManagerService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index b8469474aa18..8fc696556e29 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -17,7 +17,6 @@ package com.android.server.wallpaper; import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL; -import static android.Manifest.permission.MANAGE_EXTERNAL_STORAGE; import static android.Manifest.permission.READ_WALLPAPER_INTERNAL; import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND; import static android.app.WallpaperManager.COMMAND_REAPPLY; @@ -101,6 +100,7 @@ import android.os.ShellCallback; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; +import android.os.storage.StorageManager; import android.service.wallpaper.IWallpaperConnection; import android.service.wallpaper.IWallpaperEngine; import android.service.wallpaper.IWallpaperService; @@ -2210,7 +2210,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub IWallpaperManagerCallback cb, final int which, Bundle outParams, int wallpaperUserId, boolean getCropped) { final boolean hasPrivilege = hasPermission(READ_WALLPAPER_INTERNAL); - if (!hasPrivilege) checkPermission(MANAGE_EXTERNAL_STORAGE); + if (!hasPrivilege) { + mContext.getSystemService(StorageManager.class).checkPermissionReadImages(true, + Binder.getCallingPid(), Binder.getCallingUid(), callingPkg, callingFeatureId); + } wallpaperUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), wallpaperUserId, false, true, "getWallpaper", null); -- cgit v1.2.3-59-g8ed1b