commit c8ee263d6ef37dae334e83dbe18654cff50d6153
author arangelov <arangelov@google.com> Fri Feb 23 16:45:53 2018 +0000
committer Antoan Angelov <arangelov@google.com> Thu Mar 08 13:45:12 2018 +0000
tree a31c459a43137555fc9b8484e405e1a53634f824
parent 5f0fb0c8fa8b79a1bec22799e4d068627166f1ee

Move the support_transfer_ownership_metadata inside the device admin
descriptor XML.

Bug: 73750678
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerHostSideTransferTest#testTransferOwner
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedProfileOwnerHostSideTransferTest#testTransferOwner
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedDeviceOwnerHostSideTransferTest#testTransferOwnerNoMetadata
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.MixedProfileOwnerHostSideTransferTest#testTransferOwnerNoMetadata
Test: cts-tradefed run cts-dev --module CtsAdminTestCases --test android.admin.cts.DeviceAdminInfoTest
Change-Id: I8df63af29dbcb23332e2f291b64b8782f25a751b

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

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index d42fa99..6511f21 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -9302,9 +9302,10 @@
      * after calling this method.
      *
      * <p>The incoming target administrator must have the
-     * {@link DeviceAdminReceiver#SUPPORT_TRANSFER_OWNERSHIP_META_DATA} <code>meta-data</code> tag
-     * included in its corresponding <code>receiver</code> component with a value of {@code true}.
-     * Otherwise an {@link IllegalArgumentException} will be thrown.
+     * <code>&lt;support-transfer-ownership /&gt;</code> tag inside the
+     * <code>&lt;device-admin&gt;&lt;/device-admin&gt;</code> tags in the xml file referenced by
+     * {@link DeviceAdminReceiver#DEVICE_ADMIN_META_DATA}. Otherwise an
+     * {@link IllegalArgumentException} will be thrown.
      *
      * @param admin which {@link DeviceAdminReceiver} this request is associated with
      * @param target which {@link DeviceAdminReceiver} we want the new administrator to be