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

Merge "Rename PO Device IDs access -> Org Owned device"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-26 18:59:48 +00:00
committed by Android (Google) Code Review
parent ed4df3c2ad 18d21312ca
commit d6b38783fd
8 changed files with 113 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10832,28 +10832,38 @@ public class DevicePolicyManager {
}
/**
* Grants the profile owner of the given user access to device identifiers (such as
* serial number, IMEI and MEID).
* Deprecated. Use {@code markProfileOwnerOnOrganizationOwnedDevice} instead.
* Throws UnsupportedOperationException when called.
*
* <p>This lets the profile owner request inclusion of device identifiers when calling
* {@link generateKeyPair}.
*
* <p>This grant is necessary to guarantee that profile owners can access device identifiers.
*
* <p>Privileged system API - meant to be called by the system, particularly the managed
* provisioning app, when a work profile is set up.
* @deprecated Use {@link #markProfileOwnerOnOrganizationOwnedDevice} instead.
*
* @hide
*/
@Deprecated
@SystemApi
@RequiresPermission(value = android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS,
conditional = true)
public void setProfileOwnerCanAccessDeviceIds(@NonNull ComponentName who) {
throw new UnsupportedOperationException(
"This method is deprecated. use markProfileOwnerOnOrganizationOwnedDevice instead"
+ ".");
}
/**
* Marks the profile owner of the given user as managing an organization-owned device.
* That will give it access to device identifiers (such as serial number, IMEI and MEID)
* as well as other privileges.
*
* @hide
*/
@RequiresPermission(value = android.Manifest.permission.MARK_DEVICE_ORGANIZATION_OWNED,
conditional = true)
public void markProfileOwnerOnOrganizationOwnedDevice(@NonNull ComponentName who) {
if (mService == null) {
return;
}
try {
mService.grantDeviceIdsAccessToProfileOwner(who, myUserId());
mService.markProfileOwnerOnOrganizationOwnedDevice(who, myUserId());
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}

2
core/java/android/app/admin/IDevicePolicyManager.aidl
View File

@@ -426,7 +426,7 @@ interface IDevicePolicyManager {
int getGlobalPrivateDnsMode(in ComponentName admin);
String getGlobalPrivateDnsHost(in ComponentName admin);
void grantDeviceIdsAccessToProfileOwner(in ComponentName who, int userId);
void markProfileOwnerOnOrganizationOwnedDevice(in ComponentName who, int userId);
void installUpdateFromFile(in ComponentName admin, in ParcelFileDescriptor updateFileDescriptor, in StartInstallingUpdateCallback listener);