Merge "Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL... (7363ac80) · Commits · e / os / android_frameworks_base

drm/common/IDrmManagerService.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -621,11 +621,6 @@ status_t BpDrmManagerService::closeDecryptSession(int uniqueId, DecryptHandle* d

		remote()->transact(CLOSE_DECRYPT_SESSION, data, &reply);

		if (NULL != decryptHandle->decryptInfo) {
		LOGV("deleting decryptInfo");
		delete decryptHandle->decryptInfo; decryptHandle->decryptInfo = NULL;
		}
		delete decryptHandle; decryptHandle = NULL;
		return reply.readInt32();
		}

drm/libdrmframework/DrmManagerClient.cpp

+14 −11

Original line number	Diff line number	Diff line
		@@ -77,13 +77,14 @@ int DrmManagerClient::checkRightsStatus(const String8& path, int action) {
		return mDrmManagerClientImpl->checkRightsStatus(mUniqueId, path, action);
		}

		status_t DrmManagerClient::consumeRights(DecryptHandle* decryptHandle, int action, bool reserve) {
		status_t DrmManagerClient::consumeRights(
		sp<DecryptHandle> &decryptHandle, int action, bool reserve) {
		Mutex::Autolock _l(mDecryptLock);
		return mDrmManagerClientImpl->consumeRights(mUniqueId, decryptHandle, action, reserve);
		}

		status_t DrmManagerClient::setPlaybackStatus(
		DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
		sp<DecryptHandle> &decryptHandle, int playbackStatus, int64_t position) {
		return mDrmManagerClientImpl
		->setPlaybackStatus(mUniqueId, decryptHandle, playbackStatus, position);
		}
		@@ -117,40 +118,42 @@ status_t DrmManagerClient::getAllSupportInfo(int* length, DrmSupportInfo** drmSu
		return mDrmManagerClientImpl->getAllSupportInfo(mUniqueId, length, drmSupportInfoArray);
		}

		DecryptHandle* DrmManagerClient::openDecryptSession(int fd, off64_t offset, off64_t length) {
		sp<DecryptHandle> DrmManagerClient::openDecryptSession(int fd, off64_t offset, off64_t length) {
		return mDrmManagerClientImpl->openDecryptSession(mUniqueId, fd, offset, length);
		}

		DecryptHandle* DrmManagerClient::openDecryptSession(const char* uri) {
		sp<DecryptHandle> DrmManagerClient::openDecryptSession(const char* uri) {
		return mDrmManagerClientImpl->openDecryptSession(mUniqueId, uri);
		}

		status_t DrmManagerClient::closeDecryptSession(DecryptHandle* decryptHandle) {
		status_t DrmManagerClient::closeDecryptSession(sp<DecryptHandle> &decryptHandle) {
		return mDrmManagerClientImpl->closeDecryptSession(mUniqueId, decryptHandle);
		}

		status_t DrmManagerClient::initializeDecryptUnit(
		DecryptHandle* decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo) {
		sp<DecryptHandle> &decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo) {
		Mutex::Autolock _l(mDecryptLock);
		return mDrmManagerClientImpl->initializeDecryptUnit(
		mUniqueId, decryptHandle, decryptUnitId, headerInfo);
		}

		status_t DrmManagerClient::decrypt(
		DecryptHandle* decryptHandle, int decryptUnitId,
		sp<DecryptHandle> &decryptHandle, int decryptUnitId,
		const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {
		Mutex::Autolock _l(mDecryptLock);
		return mDrmManagerClientImpl->decrypt(
		mUniqueId, decryptHandle, decryptUnitId, encBuffer, decBuffer, IV);
		}

		status_t DrmManagerClient::finalizeDecryptUnit(DecryptHandle* decryptHandle, int decryptUnitId) {
		status_t DrmManagerClient::finalizeDecryptUnit(
		sp<DecryptHandle> &decryptHandle, int decryptUnitId) {
		Mutex::Autolock _l(mDecryptLock);
		return mDrmManagerClientImpl->finalizeDecryptUnit(mUniqueId, decryptHandle, decryptUnitId);
		return mDrmManagerClientImpl->finalizeDecryptUnit(mUniqueId,
		decryptHandle, decryptUnitId);
		}

		ssize_t DrmManagerClient::pread(
		DecryptHandle* decryptHandle, void* buffer, ssize_t numBytes, off64_t offset) {
		sp<DecryptHandle> &decryptHandle, void* buffer, ssize_t numBytes, off64_t offset) {
		Mutex::Autolock _l(mDecryptLock);
		return mDrmManagerClientImpl->pread(mUniqueId, decryptHandle, buffer, numBytes, offset);
		}

drm/libdrmframework/DrmManagerClientImpl.cpp

+69 −42

Original line number	Diff line number	Diff line
		@@ -78,14 +78,16 @@ void DrmManagerClientImpl::removeClient(int uniqueId) {
		}

		status_t DrmManagerClientImpl::setOnInfoListener(
		int uniqueId, const sp<DrmManagerClient::OnInfoListener>& infoListener) {
		int uniqueId,
		const sp<DrmManagerClient::OnInfoListener>& infoListener) {
		Mutex::Autolock _l(mLock);
		mOnInfoListener = infoListener;
		return getDrmManagerService()->setDrmServiceListener(uniqueId,
		(NULL != infoListener.get()) ? this : NULL);
		}

		status_t DrmManagerClientImpl::installDrmEngine(int uniqueId, const String8& drmEngineFile) {
		status_t DrmManagerClientImpl::installDrmEngine(
		int uniqueId, const String8& drmEngineFile) {
		status_t status = DRM_ERROR_UNKNOWN;
		if (EMPTY_STRING != drmEngineFile) {
		status = getDrmManagerService()->installDrmEngine(uniqueId, drmEngineFile);
		@@ -97,7 +99,8 @@ DrmConstraints* DrmManagerClientImpl::getConstraints(
		int uniqueId, const String8* path, const int action) {
		DrmConstraints *drmConstraints = NULL;
		if ((NULL != path) && (EMPTY_STRING != *path)) {
		drmConstraints = getDrmManagerService()->getConstraints(uniqueId, path, action);
		drmConstraints =
		getDrmManagerService()->getConstraints(uniqueId, path, action);
		}
		return drmConstraints;
		}
		@@ -110,7 +113,8 @@ DrmMetadata* DrmManagerClientImpl::getMetadata(int uniqueId, const String8* path
		return drmMetadata;
		}

		bool DrmManagerClientImpl::canHandle(int uniqueId, const String8& path, const String8& mimeType) {
		bool DrmManagerClientImpl::canHandle(
		int uniqueId, const String8& path, const String8& mimeType) {
		bool retCode = false;
		if ((EMPTY_STRING != path) \|\| (EMPTY_STRING != mimeType)) {
		retCode = getDrmManagerService()->canHandle(uniqueId, path, mimeType);
		@@ -118,7 +122,8 @@ bool DrmManagerClientImpl::canHandle(int uniqueId, const String8& path, const St
		return retCode;
		}

		DrmInfoStatus* DrmManagerClientImpl::processDrmInfo(int uniqueId, const DrmInfo* drmInfo) {
		DrmInfoStatus* DrmManagerClientImpl::processDrmInfo(
		int uniqueId, const DrmInfo* drmInfo) {
		DrmInfoStatus *drmInfoStatus = NULL;
		if (NULL != drmInfo) {
		drmInfoStatus = getDrmManagerService()->processDrmInfo(uniqueId, drmInfo);
		@@ -126,7 +131,8 @@ DrmInfoStatus* DrmManagerClientImpl::processDrmInfo(int uniqueId, const DrmInfo*
		return drmInfoStatus;
		}

		DrmInfo* DrmManagerClientImpl::acquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest) {
		DrmInfo* DrmManagerClientImpl::acquireDrmInfo(
		int uniqueId, const DrmInfoRequest* drmInfoRequest) {
		DrmInfo* drmInfo = NULL;
		if (NULL != drmInfoRequest) {
		drmInfo = getDrmManagerService()->acquireDrmInfo(uniqueId, drmInfoRequest);
		@@ -138,12 +144,14 @@ status_t DrmManagerClientImpl::saveRights(int uniqueId, const DrmRights& drmRigh
		const String8& rightsPath, const String8& contentPath) {
		status_t status = DRM_ERROR_UNKNOWN;
		if (EMPTY_STRING != contentPath) {
		status = getDrmManagerService()->saveRights(uniqueId, drmRights, rightsPath, contentPath);
		status = getDrmManagerService()->saveRights(
		uniqueId, drmRights, rightsPath, contentPath);
		}
		return status;
		}

		String8 DrmManagerClientImpl::getOriginalMimeType(int uniqueId, const String8& path) {
		String8 DrmManagerClientImpl::getOriginalMimeType(
		int uniqueId, const String8& path) {
		String8 mimeType = EMPTY_STRING;
		if (EMPTY_STRING != path) {
		mimeType = getDrmManagerService()->getOriginalMimeType(uniqueId, path);
		@@ -155,7 +163,8 @@ int DrmManagerClientImpl::getDrmObjectType(
		int uniqueId, const String8& path, const String8& mimeType) {
		int drmOjectType = DrmObjectType::UNKNOWN;
		if ((EMPTY_STRING != path) \|\| (EMPTY_STRING != mimeType)) {
		drmOjectType = getDrmManagerService()->getDrmObjectType(uniqueId, path, mimeType);
		drmOjectType =
		getDrmManagerService()->getDrmObjectType(uniqueId, path, mimeType);
		}
		return drmOjectType;
		}
		@@ -164,35 +173,41 @@ int DrmManagerClientImpl::checkRightsStatus(
		int uniqueId, const String8& path, int action) {
		int rightsStatus = RightsStatus::RIGHTS_INVALID;
		if (EMPTY_STRING != path) {
		rightsStatus = getDrmManagerService()->checkRightsStatus(uniqueId, path, action);
		rightsStatus =
		getDrmManagerService()->checkRightsStatus(uniqueId, path, action);
		}
		return rightsStatus;
		}

		status_t DrmManagerClientImpl::consumeRights(
		int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve) {
		int uniqueId, sp<DecryptHandle> &decryptHandle,
		int action, bool reserve) {
		status_t status = DRM_ERROR_UNKNOWN;
		if (NULL != decryptHandle) {
		status = getDrmManagerService()->consumeRights(uniqueId, decryptHandle, action, reserve);
		if (NULL != decryptHandle.get()) {
		status = getDrmManagerService()->consumeRights(
		uniqueId, decryptHandle.get(), action, reserve);
		}
		return status;
		}

		status_t DrmManagerClientImpl::setPlaybackStatus(
		int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
		int uniqueId, sp<DecryptHandle> &decryptHandle,
		int playbackStatus, int64_t position) {
		status_t status = DRM_ERROR_UNKNOWN;
		if (NULL != decryptHandle) {
		if (NULL != decryptHandle.get()) {
		status = getDrmManagerService()->setPlaybackStatus(
		uniqueId, decryptHandle, playbackStatus, position);
		uniqueId, decryptHandle.get(), playbackStatus, position);
		}
		return status;
		}

		bool DrmManagerClientImpl::validateAction(
		int uniqueId, const String8& path, int action, const ActionDescription& description) {
		int uniqueId, const String8& path,
		int action, const ActionDescription& description) {
		bool retCode = false;
		if (EMPTY_STRING != path) {
		retCode = getDrmManagerService()->validateAction(uniqueId, path, action, description);
		retCode = getDrmManagerService()->validateAction(
		uniqueId, path, action, description);
		}
		return retCode;
		}
		@@ -209,7 +224,8 @@ status_t DrmManagerClientImpl::removeAllRights(int uniqueId) {
		return getDrmManagerService()->removeAllRights(uniqueId);
		}

		int DrmManagerClientImpl::openConvertSession(int uniqueId, const String8& mimeType) {
		int DrmManagerClientImpl::openConvertSession(
		int uniqueId, const String8& mimeType) {
		int retCode = INVALID_VALUE;
		if (EMPTY_STRING != mimeType) {
		retCode = getDrmManagerService()->openConvertSession(uniqueId, mimeType);
		@@ -221,12 +237,14 @@ DrmConvertedStatus* DrmManagerClientImpl::convertData(
		int uniqueId, int convertId, const DrmBuffer* inputData) {
		DrmConvertedStatus* drmConvertedStatus = NULL;
		if (NULL != inputData) {
		drmConvertedStatus = getDrmManagerService()->convertData(uniqueId, convertId, inputData);
		drmConvertedStatus =
		getDrmManagerService()->convertData(uniqueId, convertId, inputData);
		}
		return drmConvertedStatus;
		}

		DrmConvertedStatus* DrmManagerClientImpl::closeConvertSession(int uniqueId, int convertId) {
		DrmConvertedStatus* DrmManagerClientImpl::closeConvertSession(
		int uniqueId, int convertId) {
		return getDrmManagerService()->closeConvertSession(uniqueId, convertId);
		}

		@@ -234,17 +252,19 @@ status_t DrmManagerClientImpl::getAllSupportInfo(
		int uniqueId, int* length, DrmSupportInfo** drmSupportInfoArray) {
		status_t status = DRM_ERROR_UNKNOWN;
		if ((NULL != drmSupportInfoArray) && (NULL != length)) {
		status = getDrmManagerService()->getAllSupportInfo(uniqueId, length, drmSupportInfoArray);
		status = getDrmManagerService()->getAllSupportInfo(
		uniqueId, length, drmSupportInfoArray);
		}
		return status;
		}

		DecryptHandle* DrmManagerClientImpl::openDecryptSession(
		sp<DecryptHandle> DrmManagerClientImpl::openDecryptSession(
		int uniqueId, int fd, off64_t offset, off64_t length) {
		return getDrmManagerService()->openDecryptSession(uniqueId, fd, offset, length);
		}

		DecryptHandle* DrmManagerClientImpl::openDecryptSession(int uniqueId, const char* uri) {
		sp<DecryptHandle> DrmManagerClientImpl::openDecryptSession(
		int uniqueId, const char* uri) {
		DecryptHandle* handle = NULL;
		if (NULL != uri) {
		handle = getDrmManagerService()->openDecryptSession(uniqueId, uri);
		@@ -252,50 +272,57 @@ DecryptHandle* DrmManagerClientImpl::openDecryptSession(int uniqueId, const char
		return handle;
		}

		status_t DrmManagerClientImpl::closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {
		status_t DrmManagerClientImpl::closeDecryptSession(
		int uniqueId, sp<DecryptHandle> &decryptHandle) {
		status_t status = DRM_ERROR_UNKNOWN;
		if (NULL != decryptHandle) {
		status = getDrmManagerService()->closeDecryptSession( uniqueId, decryptHandle);
		if (NULL != decryptHandle.get()) {
		status = getDrmManagerService()->closeDecryptSession(
		uniqueId, decryptHandle.get());
		}
		return status;
		}

		status_t DrmManagerClientImpl::initializeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle,
		status_t DrmManagerClientImpl::initializeDecryptUnit(
		int uniqueId, sp<DecryptHandle> &decryptHandle,
		int decryptUnitId, const DrmBuffer* headerInfo) {
		status_t status = DRM_ERROR_UNKNOWN;
		if ((NULL != decryptHandle) && (NULL != headerInfo)) {
		if ((NULL != decryptHandle.get()) && (NULL != headerInfo)) {
		status = getDrmManagerService()->initializeDecryptUnit(
		uniqueId, decryptHandle, decryptUnitId, headerInfo);
		uniqueId, decryptHandle.get(), decryptUnitId, headerInfo);
		}
		return status;
		}

		status_t DrmManagerClientImpl::decrypt(int uniqueId, DecryptHandle* decryptHandle,
		int decryptUnitId, const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {
		status_t DrmManagerClientImpl::decrypt(
		int uniqueId, sp<DecryptHandle> &decryptHandle,
		int decryptUnitId, const DrmBuffer* encBuffer,
		DrmBuffer** decBuffer, DrmBuffer* IV) {
		status_t status = DRM_ERROR_UNKNOWN;
		if ((NULL != decryptHandle) && (NULL != encBuffer)
		if ((NULL != decryptHandle.get()) && (NULL != encBuffer)
		&& (NULL != decBuffer) && (NULL != *decBuffer)) {
		status = getDrmManagerService()->decrypt(
		uniqueId, decryptHandle, decryptUnitId, encBuffer, decBuffer, IV);
		uniqueId, decryptHandle.get(), decryptUnitId,
		encBuffer, decBuffer, IV);
		}
		return status;
		}

		status_t DrmManagerClientImpl::finalizeDecryptUnit(
		int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId) {
		int uniqueId, sp<DecryptHandle> &decryptHandle, int decryptUnitId) {
		status_t status = DRM_ERROR_UNKNOWN;
		if (NULL != decryptHandle) {
		status
		= getDrmManagerService()->finalizeDecryptUnit(uniqueId, decryptHandle, decryptUnitId);
		if (NULL != decryptHandle.get()) {
		status = getDrmManagerService()->finalizeDecryptUnit(
		uniqueId, decryptHandle.get(), decryptUnitId);
		}
		return status;
		}

		ssize_t DrmManagerClientImpl::pread(int uniqueId, DecryptHandle* decryptHandle,
		ssize_t DrmManagerClientImpl::pread(int uniqueId, sp<DecryptHandle> &decryptHandle,
		void* buffer, ssize_t numBytes, off64_t offset) {
		ssize_t retCode = INVALID_VALUE;
		if ((NULL != decryptHandle) && (NULL != buffer) && (0 < numBytes)) {
		retCode = getDrmManagerService()->pread(uniqueId, decryptHandle, buffer, numBytes, offset);
		if ((NULL != decryptHandle.get()) && (NULL != buffer) && (0 < numBytes)) {
		retCode = getDrmManagerService()->pread(
		uniqueId, decryptHandle.get(), buffer, numBytes, offset);
		}
		return retCode;
		}

drm/libdrmframework/include/DrmManagerClientImpl.h

+9 −9

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ public:
		* @return status_t
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t consumeRights(int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve);
		status_t consumeRights(int uniqueId, sp<DecryptHandle> &decryptHandle, int action, bool reserve);

		/**
		* Informs the DRM engine about the playback actions performed on the DRM files.
		@@ -203,7 +203,7 @@ public:
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t setPlaybackStatus(
		int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position);
		int uniqueId, sp<DecryptHandle> &decryptHandle, int playbackStatus, int64_t position);

		/**
		* Validates whether an action on the DRM content is allowed or not.
		@@ -303,7 +303,7 @@ public:
		* @return
		* Handle for the decryption session
		*/
		DecryptHandle* openDecryptSession(int uniqueId, int fd, off64_t offset, off64_t length);
		sp<DecryptHandle> openDecryptSession(int uniqueId, int fd, off64_t offset, off64_t length);

		/**
		* Open the decrypt session to decrypt the given protected content
		@@ -313,7 +313,7 @@ public:
		* @return
		* Handle for the decryption session
		*/
		DecryptHandle* openDecryptSession(int uniqueId, const char* uri);
		sp<DecryptHandle> openDecryptSession(int uniqueId, const char* uri);

		/**
		* Close the decrypt session for the given handle
		@@ -323,7 +323,7 @@ public:
		* @return status_t
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle);
		status_t closeDecryptSession(int uniqueId, sp<DecryptHandle> &decryptHandle);

		/**
		* Initialize decryption for the given unit of the protected content
		@@ -335,7 +335,7 @@ public:
		* @return status_t
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t initializeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle,
		status_t initializeDecryptUnit(int uniqueId, sp<DecryptHandle> &decryptHandle,
		int decryptUnitId, const DrmBuffer* headerInfo);

		/**
		@@ -355,7 +355,7 @@ public:
		* DRM_ERROR_SESSION_NOT_OPENED, DRM_ERROR_DECRYPT_UNIT_NOT_INITIALIZED,
		* DRM_ERROR_DECRYPT for failure.
		*/
		status_t decrypt(int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId,
		status_t decrypt(int uniqueId, sp<DecryptHandle> &decryptHandle, int decryptUnitId,
		const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV);

		/**
		@@ -367,7 +367,7 @@ public:
		* @return status_t
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t finalizeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId);
		status_t finalizeDecryptUnit(int uniqueId, sp<DecryptHandle> &decryptHandle, int decryptUnitId);

		/**
		* Reads the specified number of bytes from an open DRM file.
		@@ -380,7 +380,7 @@ public:
		*
		* @return Number of bytes read. Returns -1 for Failure.
		*/
		ssize_t pread(int uniqueId, DecryptHandle* decryptHandle,
		ssize_t pread(int uniqueId, sp<DecryptHandle> &decryptHandle,
		void* buffer, ssize_t numBytes, off64_t offset);

		/**

include/drm/DrmManagerClient.h

+12 −9

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public:
		* @return
		* Handle for the decryption session
		*/
		DecryptHandle* openDecryptSession(int fd, off64_t offset, off64_t length);
		sp<DecryptHandle> openDecryptSession(int fd, off64_t offset, off64_t length);

		/**
		* Open the decrypt session to decrypt the given protected content
		@@ -78,7 +78,7 @@ public:
		* @return
		* Handle for the decryption session
		*/
		DecryptHandle* openDecryptSession(const char* uri);
		sp<DecryptHandle> openDecryptSession(const char* uri);

		/**
		* Close the decrypt session for the given handle
		@@ -87,7 +87,7 @@ public:
		* @return status_t
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t closeDecryptSession(DecryptHandle* decryptHandle);
		status_t closeDecryptSession(sp<DecryptHandle> &decryptHandle);

		/**
		* Consumes the rights for a content.
		@@ -101,7 +101,7 @@ public:
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure.
		* In case license has been expired, DRM_ERROR_LICENSE_EXPIRED will be returned.
		*/
		status_t consumeRights(DecryptHandle* decryptHandle, int action, bool reserve);
		status_t consumeRights(sp<DecryptHandle> &decryptHandle, int action, bool reserve);

		/**
		* Informs the DRM engine about the playback actions performed on the DRM files.
		@@ -113,7 +113,8 @@ public:
		* @return status_t
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t setPlaybackStatus(DecryptHandle* decryptHandle, int playbackStatus, int64_t position);
		status_t setPlaybackStatus(
		sp<DecryptHandle> &decryptHandle, int playbackStatus, int64_t position);

		/**
		* Initialize decryption for the given unit of the protected content
		@@ -125,7 +126,7 @@ public:
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t initializeDecryptUnit(
		DecryptHandle* decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo);
		sp<DecryptHandle> &decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo);

		/**
		* Decrypt the protected content buffers for the given unit
		@@ -144,7 +145,7 @@ public:
		* DRM_ERROR_DECRYPT for failure.
		*/
		status_t decrypt(
		DecryptHandle* decryptHandle, int decryptUnitId,
		sp<DecryptHandle> &decryptHandle, int decryptUnitId,
		const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV = NULL);

		/**
		@@ -155,7 +156,8 @@ public:
		* @return status_t
		* Returns DRM_NO_ERROR for success, DRM_ERROR_UNKNOWN for failure
		*/
		status_t finalizeDecryptUnit(DecryptHandle* decryptHandle, int decryptUnitId);
		status_t finalizeDecryptUnit(
		sp<DecryptHandle> &decryptHandle, int decryptUnitId);

		/**
		* Reads the specified number of bytes from an open DRM file.
		@@ -167,7 +169,8 @@ public:
		*
		* @return Number of bytes read. Returns -1 for Failure.
		*/
		ssize_t pread(DecryptHandle* decryptHandle, void* buffer, ssize_t numBytes, off64_t offset);
		ssize_t pread(sp<DecryptHandle> &decryptHandle,
		void* buffer, ssize_t numBytes, off64_t offset);

		/**
		* Validates whether an action on the DRM content is allowed or not.