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

Merge "Fix security vulnerability in DPMS" into sc-dev am: 209f21d2ae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881810

Change-Id: Icd65a15266764566d6c6b869b665b4cd4eea6e5d
This commit is contained in:
Kholoud Mohamed
2021-06-08 13:27:12 +00:00
committed by Automerger Merge Worker
parent c9bddb2daa 209f21d2ae
commit f0f3ab11ea
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -13112,6 +13112,10 @@ public class DevicePolicyManager {
* @see #getCrossProfileCalendarPackages(ComponentName) * @see #getCrossProfileCalendarPackages(ComponentName)
* @hide * @hide
*/ */
@RequiresPermission(anyOf = {
permission.INTERACT_ACROSS_USERS_FULL,
permission.INTERACT_ACROSS_USERS
})
public @Nullable Set<String> getCrossProfileCalendarPackages() { public @Nullable Set<String> getCrossProfileCalendarPackages() {
throwIfParentInstance("getCrossProfileCalendarPackages"); throwIfParentInstance("getCrossProfileCalendarPackages");
if (mService != null) { if (mService != null) {

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -16016,9 +16016,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return Collections.emptyList(); return Collections.emptyList();
} }
Preconditions.checkArgumentNonnegative(userHandle, "Invalid userId"); Preconditions.checkArgumentNonnegative(userHandle, "Invalid userId");
Preconditions.checkCallAuthorization(
final CallerIdentity caller = getCallerIdentity(); hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)
Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userHandle)); || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS_FULL));
synchronized (getLockObject()) { synchronized (getLockObject()) {
final ActiveAdmin admin = getProfileOwnerAdminLocked(userHandle); final ActiveAdmin admin = getProfileOwnerAdminLocked(userHandle);