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

Commit 2400e57c authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Restore old StorageManager permission check" into udc-dev

parents 6cdafdb7 19ceb430

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

+7 −1
Original line number Diff line number Diff line
@@ -90,6 +90,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;
@@ -2209,7 +2210,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    public ParcelFileDescriptor getWallpaperWithFeature(String callingPkg, String callingFeatureId,

            IWallpaperManagerCallback cb, final int which, Bundle outParams, int wallpaperUserId,

            boolean getCropped) {

        checkPermission(READ_WALLPAPER_INTERNAL);

        final boolean hasPrivilege = hasPermission(READ_WALLPAPER_INTERNAL);

        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);