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

Commit 6ca24eea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Makes acknowledgeNewUserDisclaimer() a @TestApi"

parents 79718744 247a0596

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,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 {
@@ -10333,6 +10334,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