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

Merge "Address API Review for setProfileOwnerCanAccessDeviceIds" into rvc-dev am: 7924f675e1

Browse Source 
Change-Id: I35a8a266e8f26b185bedf67b0730a1783d3ea0eb
This commit is contained in:
TreeHugger Robot
2020-03-20 15:51:16 +00:00
committed by Automerger Merge Worker
parent ecb57d12c9 7924f675e1
commit 7e1d70d37c
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11496,7 +11496,11 @@ public class DevicePolicyManager {
/** /**
* Deprecated. Use {@code markProfileOwnerOnOrganizationOwnedDevice} instead. * Deprecated. Use {@code markProfileOwnerOnOrganizationOwnedDevice} instead.
* Throws UnsupportedOperationException when called. * When called by an app targeting SDK level {@link android.os.Build.VERSION_CODES#Q} or
* below, will behave the same as {@link #markProfileOwnerOnOrganizationOwnedDevice}.
*
* When called by an app targeting SDK level {@link android.os.Build.VERSION_CODES#R}
* or above, will throw an UnsupportedOperationException when called.
* *
* @deprecated Use {@link #markProfileOwnerOnOrganizationOwnedDevice} instead. * @deprecated Use {@link #markProfileOwnerOnOrganizationOwnedDevice} instead.
* *
@@ -11507,9 +11511,14 @@ public class DevicePolicyManager {
@RequiresPermission(value = android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, @RequiresPermission(value = android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS,
conditional = true) conditional = true)
public void setProfileOwnerCanAccessDeviceIds(@NonNull ComponentName who) { public void setProfileOwnerCanAccessDeviceIds(@NonNull ComponentName who) {
ApplicationInfo ai = mContext.getApplicationInfo();
if (ai.targetSdkVersion > Build.VERSION_CODES.Q) {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"This method is deprecated. use markProfileOwnerOnOrganizationOwnedDevice instead" "This method is deprecated. use markProfileOwnerOnOrganizationOwnedDevice"
+ "."); + " instead.");
} else {
markProfileOwnerOnOrganizationOwnedDevice(who);
}
} }
/** /**