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

Restrict cross-user wallpaper inspection

Browse Source 
Don't provide information about published wallpaper resources across
user boundaries unless the caller holds full cross-user permission.

Bug: 193800652
Test: atest WallpaperManagerTest
Test: manual POC
Change-Id: Ia2944dd32fdae47657a6683125eb3da54e6a2d2e
(cherry picked from commit be08e04092)
This commit is contained in:
Christopher Tate
2021-08-13 13:58:40 -07:00
committed by Chris Tate
parent 6381b7c63a
commit 55c1b28259
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.server.wallpaper;
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
import static android.app.WallpaperManager.COMMAND_REAPPLY;
import static android.app.WallpaperManager.FLAG_LOCK;
import static android.app.WallpaperManager.FLAG_SYSTEM;
@@ -2045,7 +2046,21 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
}
}
private boolean hasCrossUserPermission() {
final int interactPermission =
mContext.checkCallingPermission(INTERACT_ACROSS_USERS_FULL);
return interactPermission == PackageManager.PERMISSION_GRANTED;
}
@Override
public boolean hasNamedWallpaper(String name) {
final int callingUser = UserHandle.getCallingUserId();
final boolean allowCrossUser = hasCrossUserPermission();
if (DEBUG) {
Slog.d(TAG, "hasNamedWallpaper() caller " + Binder.getCallingUid()
+ " cross-user?: " + allowCrossUser);
}
synchronized (mLock) {
List<UserInfo> users;
final long ident = Binder.clearCallingIdentity();
@@ -2055,6 +2070,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
Binder.restoreCallingIdentity(ident);
}
for (UserInfo user: users) {
if (!allowCrossUser && callingUser != user.id) {
// No cross-user information for callers without permission
continue;
}
// ignore managed profiles
if (user.isManagedProfile()) {
continue;