From 308cafe88e18ccea729e869bb3899690b70372a2 Mon Sep 17 00:00:00 2001
From: Kholoud Mohamed <kholoudm@google.com>
Date: Tue, 15 Dec 2020 16:10:03 +0000
Subject: [PATCH] Expose forceUpdateUserSetupComplete as a TestAPI

This is needed to allow the new DPM#provisionFullyManagedDevice
API to work from CTS tests.

Bug: 175392542
Test: N/A
Change-Id: I79a18ef97deab1aa36b3f3d68e8f74b72794aab5
---
 core/api/test-current.txt                            | 1 +
 core/java/android/app/admin/DevicePolicyManager.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index ffe2736fe8c5d..5d970894b4cbb 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -371,6 +371,7 @@ package android.app {
 package android.app.admin {
 
   public class DevicePolicyManager {
+    method public void forceUpdateUserSetupComplete();
     method public long getLastBugReportRequestTime();
     method public long getLastNetworkLogRetrievalTime();
     method public long getLastSecurityLogRetrievalTime();
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 94084b851ae03..f14f43eed5f59 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -11134,6 +11134,7 @@ public class DevicePolicyManager {
      *         {@code android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS} or the caller is
      *         not {@link UserHandle#SYSTEM_USER}
      */
+    @TestApi
     public void forceUpdateUserSetupComplete() {
         try {
             mService.forceUpdateUserSetupComplete();