commit 4ccad5c0ee1a8ea15a2c0ae26e2cc7df39b6b6a4
author Clay Murphy <claym@google.com> Wed Nov 04 18:53:32 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 04 18:53:32 2015 +0000
tree a79ff1148952df6d4e51a5808fbb79e5a242b393
parent cdf8fa2bde1ea9641f84d201a6e884729f3256fc
parent cb2d671428247a971d8e041fabf79de133997ada

Merge "Docs: Add 6.0 section for Mac OS and Yosemite"

src/devices/drm.jd

diff --git a/src/devices/drm.jd b/src/devices/drm.jd
index 87b967a..4a7dec6 100644
--- a/src/devices/drm.jd
+++ b/src/devices/drm.jd
@@ -172,17 +172,18 @@
 <code>int checkRightsStatus(int uniqueId, const String8&amp; path, int
 action);</code>
 
+<p>Check whether the given content has valid rights or not.  The input
+parameters are the content file path where the content was saved and the action
+to query rights for, for example: Action::DEFAULT, Action::PLAY.  Returns the
+status of the rights for the protected content, such as
+RightsStatus::RIGHTS_VALID, RightsStatus::RIGHTS_EXPIRED.</p>
+
+<code>status_t saveRights(int uniqueId, const DrmRights&amp; drmRights, const String8&amp; rightsPath, const String8&amp; contentPath);</code>
+
 <p>Save DRM rights to the specified rights path and make association with content path.
 The input parameters are the DrmRights to be saved, the rights file path where rights
 are to be saved, and the content file path where content was saved.</p>
 
-<code>status_t saveRights(int uniqueId, const DrmRights&amp; drmRights,
-            const String8&amp; rightsPath, const String8&amp;
-contentPath);</code>
-
-<p>Save DRM rights to specified rights path and make association with content
-path.</p>
-
 <h3 id="metadata">License Metadata</h3>
 <p>License metadata such as license expiry time, repeatable count and etc., may be
 embedded inside the rights of the protected content. The Android DRM framework