Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b01e10c5: There is no @note javadoc tag.

Browse Source 
Merge commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2' into gingerbread-plus-aosp

* commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2':
  There is no @note javadoc tag.
This commit is contained in:
Joe Onorato
2010-09-16 15:00:50 -07:00
committed by Android Git Automerger
parent 4cd34abe53 b01e10c5bc
commit d47761ea86
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drm/java/android/drm/DrmManagerClient.java
View File

@@ -213,12 +213,12 @@ public class DrmManagerClient {
* Save DRM rights to specified rights path * Save DRM rights to specified rights path
* and make association with content 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 drmRights DrmRights to be saved
* @param rightsPath File path where rights to be saved * @param rightsPath File path where rights to be saved
* @param contentPath File path where content was saved * @param contentPath File path where content was saved
* @throws IOException if failed to save rights information in the given path * @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( public void saveRights(
DrmRights drmRights, String rightsPath, String contentPath) throws IOException { 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 path Path of the content to be handled
* @param mimeType Mimetype of the object to be handled * @param mimeType Mimetype of the object to be handled
* @return * @return
* true - if the given mimeType or path can be handled * true - if the given mimeType or path can be handled.
* false - cannot be handled. * false - cannot be handled. false will be returned in case
* @note false will be return in case the state is uninitialized * the state is uninitialized
*/ */
public boolean canHandle(String path, String mimeType) { public boolean canHandle(String path, String mimeType) {
if ((null == path || path.equals("")) && (null == mimeType || mimeType.equals(""))) { if ((null == path || path.equals("")) && (null == mimeType || mimeType.equals(""))) {