Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 247a0596 authored by Felipe Leme's avatar Felipe Leme
Browse files

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
parent 26e6ae71

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

core/java/android/app/admin/DevicePolicyManager.java

+3 −1
Original line number Diff line number Diff line
@@ -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