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

Merge "Fix isSetWallpaperAllowed secondary user"

Browse Source
This commit is contained in:
Adam Bookatz
2019-11-07 22:39:21 +00:00
committed by Android (Google) Code Review
parent 2757d63972 cfc5d19eb6
commit 987f4368f4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,7 @@ import android.os.SELinux;
import android.os.SystemClock;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.UserManagerInternal;
import android.os.storage.StorageManager;
import android.service.wallpaper.IWallpaperConnection;
import android.service.wallpaper.IWallpaperEngine;
@@ -2818,12 +2819,19 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
return false; // callingPackage was faked.
}
// TODO(b/144048540): DPM needs to take into account the userId, not just the package.
final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
if (dpm.isDeviceOwnerApp(callingPackage) || dpm.isProfileOwnerApp(callingPackage)) {
return true;
}
final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
return !um.hasUserRestriction(UserManager.DISALLOW_SET_WALLPAPER);
final int callingUserId = UserHandle.getCallingUserId();
final long ident = Binder.clearCallingIdentity();
try {
UserManagerInternal umi = LocalServices.getService(UserManagerInternal.class);
return !umi.hasUserRestriction(UserManager.DISALLOW_SET_WALLPAPER, callingUserId);
} finally {
Binder.restoreCallingIdentity(ident);
}
}
@Override