summaryrefslogtreecommitdiffstats
path: root/drm/java/android/drm/DrmInfoStatus.java
diff options
context:
space:
mode:
authorTakeshi Aimi <aimitakeshi@gmail.com>2010-10-08 23:05:49 +0900
committerTakeshi Aimi <aimitakeshi@gmail.com>2010-11-02 08:06:06 +0900
commitc7b3ccc564448cb4b918728421f9402bc18278c5 (patch)
tree7d97c647cef5ae086048f62636bad3343f193459 /drm/java/android/drm/DrmInfoStatus.java
parent5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630 (diff)
downloadframeworks_base-c7b3ccc564448cb4b918728421f9402bc18278c5.zip
frameworks_base-c7b3ccc564448cb4b918728421f9402bc18278c5.tar.gz
frameworks_base-c7b3ccc564448cb4b918728421f9402bc18278c5.tar.bz2
Update of DRM framework
- Overload openDecryptSession() with uri parameter in order to accept URI of DRM content, Following API is added, DecryptHandle*openDecryptSession(const char* uri);. - Unify texisting three event types of processDrmInfo() so that caller of DRM framework does not have to handle many event types. - Let DrmManagerService call load/unload plugins API so that client of DRM framework does not have to manage plug-in load/unload. - Trivial fix in DrmManagerClient.java is also incorporated. Changes are made by Sony Corporation. Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
Diffstat (limited to 'drm/java/android/drm/DrmInfoStatus.java')
-rw-r--r--drm/java/android/drm/DrmInfoStatus.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/drm/java/android/drm/DrmInfoStatus.java b/drm/java/android/drm/DrmInfoStatus.java
index 7e9ca3e..b37ea51 100644
--- a/drm/java/android/drm/DrmInfoStatus.java
+++ b/drm/java/android/drm/DrmInfoStatus.java
@@ -31,6 +31,7 @@ public class DrmInfoStatus {
public static final int STATUS_ERROR = 2;
public final int statusCode;
+ public final int infoType;
public final String mimeType;
public final ProcessedData data;
@@ -38,11 +39,13 @@ public class DrmInfoStatus {
* constructor to create DrmInfoStatus object with given parameters
*
* @param _statusCode Status of the communication
+ * @param _infoType Type of the DRM information processed
* @param _data The processed data
* @param _mimeType MIME type
*/
- public DrmInfoStatus(int _statusCode, ProcessedData _data, String _mimeType) {
+ public DrmInfoStatus(int _statusCode, int _infoType, ProcessedData _data, String _mimeType) {
statusCode = _statusCode;
+ infoType = _infoType;
data = _data;
mimeType = _mimeType;
}