Merge "Update of DRM framework"

Author: Gloria Wang

api/current.xml

@@ -55656,29 +55656,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="2012"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="TYPE_FINALIZE_FAILED"
- type="int"
- transient="false"
- volatile="false"
- value="2010"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="TYPE_INITIALIZE_FAILED"
- type="int"
- transient="false"
- volatile="false"
- value="2009"
+ value="2008"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -55718,7 +55696,7 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_REGISTRATION_FAILED"
+<field name="TYPE_PROCESS_DRM_INFO_FAILED"
  type="int"
  transient="false"
  volatile="false"
@@ -55733,18 +55711,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="2011"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="TYPE_RIGHTS_ACQUISITION_FAILED"
- type="int"
- transient="false"
- volatile="false"
- value="2008"
+ value="2007"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -55773,17 +55740,6 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_UNREGISTRATION_FAILED"
- type="int"
- transient="false"
- volatile="false"
- value="2007"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </class>
 <class name="DrmEvent"
  extends="java.lang.Object"
@@ -55863,28 +55819,6 @@
 >
 </field>
 <field name="TYPE_ALL_RIGHTS_REMOVED"
- type="int"
- transient="false"
- volatile="false"
- value="1006"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="TYPE_DRM_INFO_ACQUIRED"
- type="int"
- transient="false"
- volatile="false"
- value="1007"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="TYPE_FINALIZED"
  type="int"
  transient="false"
  volatile="false"
@@ -55895,7 +55829,7 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_INITIALIZED"
+<field name="TYPE_DRM_INFO_ACQUIRED"
  type="int"
  transient="false"
  volatile="false"
@@ -55906,7 +55840,7 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_REGISTERED"
+<field name="TYPE_DRM_INFO_PROCESSED"
  type="int"
  transient="false"
  volatile="false"
@@ -55917,28 +55851,6 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_RIGHTS_ACQUIRED"
- type="int"
- transient="false"
- volatile="false"
- value="1005"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="TYPE_UNREGISTERED"
- type="int"
- transient="false"
- volatile="false"
- value="1004"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </class>
 <class name="DrmInfo"
  extends="java.lang.Object"
@@ -56314,6 +56226,8 @@
 >
 <parameter name="_statusCode" type="int">
 </parameter>
+<parameter name="_infoType" type="int">
+</parameter>
 <parameter name="_data" type="android.drm.ProcessedData">
 </parameter>
 <parameter name="_mimeType" type="java.lang.String">
@@ -56351,6 +56265,16 @@
  visibility="public"
 >
 </field>
+<field name="infoType"
+ type="int"
+ transient="false"
+ volatile="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="mimeType"
  type="java.lang.String"
  transient="false"
@@ -56614,17 +56538,6 @@
 <parameter name="uri" type="android.net.Uri">
 </parameter>
 </method>
-<method name="loadPlugIns"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="openConvertSession"
  return="int"
  abstract="false"
@@ -56746,17 +56659,6 @@
 <parameter name="infoListener" type="android.drm.DrmManagerClient.OnInfoListener">
 </parameter>
 </method>
-<method name="unloadPlugIns"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <field name="ERROR_NONE"
  type="int"
  transient="false"

drm/common/DrmEngineBase.cpp

@@ -120,6 +120,11 @@ status_t DrmEngineBase::openDecryptSession(
     return onOpenDecryptSession(uniqueId, decryptHandle, fd, offset, length);
 }
 
+status_t DrmEngineBase::openDecryptSession(
+    int uniqueId, DecryptHandle* decryptHandle, const char* uri) {
+    return onOpenDecryptSession(uniqueId, decryptHandle, uri);
+}
+
 status_t DrmEngineBase::closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {
     return onCloseDecryptSession(uniqueId, decryptHandle);
 }

drm/common/DrmInfoStatus.cpp

@@ -19,8 +19,9 @@
 using namespace android;
 
 DrmInfoStatus::DrmInfoStatus(
-    int _statusCode, const DrmBuffer* _drmBuffer, const String8& _mimeType) :
+    int _statusCode, int _infoType, const DrmBuffer* _drmBuffer, const String8& _mimeType) :
     statusCode(_statusCode),
+    infoType(_infoType),
     drmBuffer(_drmBuffer),
     mimeType(_mimeType) {