Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ec01f8a authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Revert "Replace legacy StorageManager check"" into main

parents a2695723 38407174

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -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);