Merge "Makes acknowledgeNewUserDisclaimer() a @TestApi"
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index d683190..bcba21b0 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -486,6 +486,7 @@
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 fde9b96..6614be7 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3703,8 +3703,9 @@
*/
@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 @@
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