From 541afcd0b761769cc519bcb99c9cd4ebd7c0c42d Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Fri, 7 Nov 2014 11:18:12 +0000
Subject: [PATCH] Clarify documentation for DevicePolicyManager

Bug: 17634106
Change-Id: I93e4c10cb942bc8452043f81f460a5db6c3bd0a4
---
 core/java/android/app/admin/DevicePolicyManager.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index cf7c5e55e7a99..9157b1b16b7d0 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -62,13 +62,16 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * Public interface for managing policies enforced on a device.  Most clients
- * of this class must have published a {@link DeviceAdminReceiver} that the user
- * has currently enabled.
+ * Public interface for managing policies enforced on a device. Most clients of this class must be
+ * registered with the system as a
+ * <a href={@docRoot}guide/topics/admin/device-admin.html">device administrator</a>. Additionally,
+ * a device administrator may be registered as either a profile or device owner. A given method is
+ * accessible to all device administrators unless the documentation for that method specifies that
+ * it is restricted to either device or profile owners.
  *
  * <div class="special reference">
  * <h3>Developer Guides</h3>
- * <p>For more information about managing policies for device adminstration, read the
+ * <p>For more information about managing policies for device administration, read the
  * <a href="{@docRoot}guide/topics/admin/device-admin.html">Device Administration</a>
  * developer guide.</p>
  * </div>