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

Merge "Temporarily restore device identifiers access to Profile Owner"

Browse Source
This commit is contained in:
Eran Messeri
2019-12-19 18:03:40 +00:00
committed by Android (Google) Code Review
parent e1fa031cd1 53c777b251
commit 73b4b64be8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8701,9 +8701,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// Allow access to the profile owner for the specified user, or delegate cert installer
// But only if this is an organization-owned device.
ComponentName profileOwner = getProfileOwnerAsUser(userId);
if (profileOwner != null && canProfileOwnerAccessDeviceIds(userId)
final boolean isCallerProfileOwnerOrDelegate = profileOwner != null
&& (profileOwner.getPackageName().equals(packageName)
|| isCallerDelegate(packageName, uid, DELEGATION_CERT_INSTALL))) {
|| isCallerDelegate(packageName, uid, DELEGATION_CERT_INSTALL));
if (isCallerProfileOwnerOrDelegate && canProfileOwnerAccessDeviceIds(userId)) {
return true;
}
//TODO(b/130844684): Temporarily allow profile owner on non-organization-owned devices
//to read device identifiers.
if (isCallerProfileOwnerOrDelegate) {
return true;
}