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

Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev

Browse Source 
am: 1b7162ad3d

Change-Id: I58f01676399514276b18d633bce4638dc179b66c
This commit is contained in:
Rahul Frias
2018-03-30 23:02:15 +00:00
committed by android-build-merger
parent d3b9df79e3 1b7162ad3d
commit 02c7881824
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/MediaDrm.java
View File

@@ -705,7 +705,9 @@ public final class MediaDrm implements AutoCloseable {
public @interface KeyType {}
/**
* Contains the opaque data an app uses to request keys from a license server
* Contains the opaque data an app uses to request keys from a license server.
* These request types may or may not be generated by a given plugin. Refer
* to plugin vendor documentation for more information.
*/
public static final class KeyRequest {
private byte[] mData;
@@ -730,8 +732,8 @@ public final class MediaDrm implements AutoCloseable {
public static final int REQUEST_TYPE_RELEASE = 2;
/**
* Keys are already loaded. No license request is necessary, and no
* key request data is returned.
* Keys are already loaded and are available for use. No license request is necessary, and
* no key request data is returned.
*/
public static final int REQUEST_TYPE_NONE = 3;