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

Makes acknowledgeNewUserDisclaimer() a @TestApi

Browse Source 
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
This commit is contained in:
Felipe Leme
2022-02-10 15:39:07 -08:00
parent 26e6ae7142
commit 247a059662
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -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();

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

@@ -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