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

Merge "Revert "WallpaperManagerService - avoid leaking whether a package is installed""

Browse Source
This commit is contained in:
Corina Grigoras
2021-10-18 09:18:34 +00:00
committed by Android (Google) Code Review
parent 9c6e07a76f 7c29701451
commit d1b61d2aca
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -2260,17 +2260,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
IWallpaperManagerCallback cb, final int which, Bundle outParams, int wallpaperUserId) {
final boolean hasPrivilege = hasPermission(READ_WALLPAPER_INTERNAL);
if (!hasPrivilege) {
try {
mContext.getSystemService(StorageManager.class).checkPermissionReadImages(true,
Binder.getCallingPid(), Binder.getCallingUid(), callingPkg,
callingFeatureId);
} catch (Exception e) {
// If the calling package name does not match a package installed on the system,
// an exception is thrown. Don't allow that exception to be thrown, otherwise,
// there is a difference in control flow that allows calling apps to determine
// if a package is installed on the device.
return null;
}
mContext.getSystemService(StorageManager.class).checkPermissionReadImages(true,
Binder.getCallingPid(), Binder.getCallingUid(), callingPkg, callingFeatureId);
}
wallpaperUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),