From 247a059662312ef09c95b05423692cd21a5a8916 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Thu, 10 Feb 2022 15:39:07 -0800 Subject: [PATCH] Makes acknowledgeNewUserDisclaimer() a @TestApi It's already a @SystemApi, but it's used by CTS so it needs to be allowlisted as @TestApi, otherwise the test fails with a NoSuchMethodException. Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testCreateAndManageUser_newUserDisclaimer Test: m update-api Bug: 217753260 Change-Id: Ied5d86a5c067d57a4ae9bbc4d753481879d2e89e --- core/api/test-current.txt | 1 + core/java/android/app/admin/DevicePolicyManager.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ff4ec311349cb..960fee8ec6031 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -483,6 +483,7 @@ package android.app { package android.app.admin { public class DevicePolicyManager { + method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void acknowledgeNewUserDisclaimer(); method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void clearOrganizationId(); method @RequiresPermission(android.Manifest.permission.CLEAR_FREEZE_PERIOD) public void clearSystemUpdatePolicyFreezePeriodRecord(); method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceNetworkLogs(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index e52ae5186180c..6cb64b1603be4 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3703,8 +3703,9 @@ public class DevicePolicyManager { */ @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) - @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @UserHandleAware + @TestApi + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public void acknowledgeNewUserDisclaimer() { if (mService != null) { try { @@ -10330,6 +10331,7 @@ public class DevicePolicyManager { throw re.rethrowFromSystemServer(); } } + /** * Gets the user a {@link #logoutUser(ComponentName)} call would switch to, * or {@code null} if the current user is not in a session (i.e., if it was not