diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 13:55:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-16 13:55:21 -0700 |
| commit | 8da8df5a7e5e1151e9aa8fbc3b276c8b7a3095e6 (patch) | |
| tree | b5af49b5fd672231fe81f67be672f04a812f2b6c | |
| parent | 707929d6f8f8ff2663da9982a99f943736b8be5c (diff) | |
| parent | 723331bde365a8b0db994a8f1856416aac2c23fa (diff) | |
| download | frameworks_base-8da8df5a7e5e1151e9aa8fbc3b276c8b7a3095e6.zip frameworks_base-8da8df5a7e5e1151e9aa8fbc3b276c8b7a3095e6.tar.gz frameworks_base-8da8df5a7e5e1151e9aa8fbc3b276c8b7a3095e6.tar.bz2 | |
Merge "There is no @note javadoc tag."
| -rw-r--r-- | drm/java/android/drm/DrmManagerClient.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index 9ee597c..7ec70da 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -213,12 +213,12 @@ public class DrmManagerClient { * Save DRM rights to specified rights path * and make association with content path. * + * <p class="note">In case of OMA or WM-DRM, rightsPath and contentPath could be null.</p> + * * @param drmRights DrmRights to be saved * @param rightsPath File path where rights to be saved * @param contentPath File path where content was saved * @throws IOException if failed to save rights information in the given path - * - * @note In case of OMA or WM-DRM, rightsPath and contentPath could be null */ public void saveRights( DrmRights drmRights, String rightsPath, String contentPath) throws IOException { @@ -256,9 +256,9 @@ public class DrmManagerClient { * @param path Path of the content to be handled * @param mimeType Mimetype of the object to be handled * @return - * true - if the given mimeType or path can be handled - * false - cannot be handled. - * @note false will be return in case the state is uninitialized + * true - if the given mimeType or path can be handled. + * false - cannot be handled. false will be returned in case + * the state is uninitialized */ public boolean canHandle(String path, String mimeType) { if ((null == path || path.equals("")) && (null == mimeType || mimeType.equals(""))) { |