Added clear-profile-owner Shell command.

Test: adb shell dumpsys activity service --user 10 com.afwsamples.testdpc clear-profile-owner

Bug: 171350084
Fixes: 177564920

Change-Id: I2946cfa044e3608644a67834395386c5b643b07d
(cherry picked from commit 9b9ce9de3aa9f59670bddd1cf367a8676da8efc3)

Author: the-felipeal

app/src/main/java/com/afwsamples/testdpc/DevicePolicyManagerGateway.java

@@ -185,6 +185,11 @@ void wipeData(int flags, @NonNull Consumer<Void> onSuccess,
      */
     void clearDeviceOwnerApp(@NonNull Consumer<Void> onSuccess, @NonNull Consumer<Exception> onError);
 
+    /**
+     * See {@link android.app.admin.DevicePolicyManager#clearProfileOwner(android.content.ComponentName)}.
+     */
+    void clearProfileOwner(@NonNull Consumer<Void> onSuccess, @NonNull Consumer<Exception> onError);
+
     /**
      * Used on error callbacks to indicate a {@link android.app.admin.DevicePolicyManager} method
      * call failed.

app/src/main/java/com/afwsamples/testdpc/DevicePolicyManagerGatewayImpl.java

@@ -380,6 +380,18 @@ public void clearDeviceOwnerApp(Consumer<Void> onSuccess, Consumer<Exception> on
         }
     }
 
+    @Override
+    public void clearProfileOwner(Consumer<Void> onSuccess, Consumer<Exception> onError) {
+        Log.d(TAG, "clearProfileOwner()");
+
+        try {
+            mDevicePolicyManager.clearProfileOwner(mAdminComponentName);
+            onSuccess.accept(null);
+        } catch (Exception e) {
+            onError.accept(e);
+        }
+    }
+
     @Override
     public String toString() {
         return "DevicePolicyManagerGatewayImpl[" + mAdminComponentName + "]";

app/src/main/java/com/afwsamples/testdpc/ShellCommand.java

@@ -69,6 +69,7 @@ final class ShellCommand {
             "get-user-control-disabled-packages";
     private static final String CMD_REMOVE_ACTIVE_ADMIN = "remove-active-admin";
     private static final String CMD_CLEAR_DEVICE_OWNER = "clear-device-owner";
+    private static final String CMD_CLEAR_PROFILE_OWNER = "clear-profile-owner";
 
     private static final String ARG_FLAGS = "--flags";
 
@@ -163,6 +164,9 @@ public void run() {
             case CMD_CLEAR_DEVICE_OWNER:
                 execute(() -> clearDeviceOwner());
                 break;
+            case CMD_CLEAR_PROFILE_OWNER:
+                execute(() -> clearProfileOwner());
+                break;
             default:
                 mWriter.printf("Invalid command: %s\n\n", cmd);
                 showUsage();
@@ -208,13 +212,14 @@ private void showUsage() {
         mWriter.printf("\t%s [NAME] - set the organization name; use it without a name to reset\n",
                 CMD_SET_ORGANIZATION_NAME);
         mWriter.printf("\t%s - get the organization name\n", CMD_GET_ORGANIZATION_NAME);
-        mWriter.printf("\t%s [PKG1] [PKG2] [PKGN] - sets the packages that the user cannot force\n"
-                + "\tstop or clear data. Use no args to reset it.\n",
+        mWriter.printf("\t%s [PKG1] [PKG2] [PKGN] - sets the packages that the user cannot\n"
+                + "\t\tforce stop or clear data. Use no args to reset it.\n",
                 CMD_SET_USER_CONTROL_DISABLED_PACKAGES);
         mWriter.printf("\t%s - gets the packages that the user cannot force stop or "
                 + "clear data\n", CMD_GET_USER_CONTROL_DISABLED_PACKAGES);
         mWriter.printf("\t%s - remove itself as an admin\n", CMD_REMOVE_ACTIVE_ADMIN);
         mWriter.printf("\t%s - clear itself as device owner \n", CMD_CLEAR_DEVICE_OWNER);
+        mWriter.printf("\t%s - clear itself as profile owner \n", CMD_CLEAR_PROFILE_OWNER);
     }
 
     private void createUser() {
@@ -447,6 +452,15 @@ private void clearDeviceOwner() {
                 (e) -> onError(e, "Error removing %s as device owner", pkg));
     }
 
+    private void clearProfileOwner() {
+        Log.i(TAG, "clearProfileOwner()");
+
+        String pkg = mDevicePolicyManagerGateway.getAdmin().getPackageName();
+        mDevicePolicyManagerGateway.clearProfileOwner(
+                (v) -> onSuccess("Removed %s as profile owner", pkg),
+                (e) -> onError(e, "Error removing %s as profile owner", pkg));
+    }
+
     private void execute(@NonNull Runnable r) {
         try {
             r.run();