am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code (9bc40a2c) · Commits · e / os / android_frameworks_av

drm/common/IDrmManagerService.cpp

+0 −25

Original line number	Diff line number	Diff line
		@@ -153,18 +153,6 @@ status_t BpDrmManagerService::setDrmServiceListener(
		return reply.readInt32();
		}

		status_t BpDrmManagerService::installDrmEngine(int uniqueId, const String8& drmEngineFile) {
		ALOGV("Install DRM Engine");
		Parcel data, reply;

		data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
		data.writeInt32(uniqueId);
		data.writeString8(drmEngineFile);

		remote()->transact(INSTALL_DRM_ENGINE, data, &reply);
		return reply.readInt32();
		}

		DrmConstraints* BpDrmManagerService::getConstraints(
		int uniqueId, const String8* path, const int action) {
		ALOGV("Get Constraints");
		@@ -853,19 +841,6 @@ status_t BnDrmManagerService::onTransact(
		return DRM_NO_ERROR;
		}

		case INSTALL_DRM_ENGINE:
		{
		ALOGV("BnDrmManagerService::onTransact :INSTALL_DRM_ENGINE");
		CHECK_INTERFACE(IDrmManagerService, data, reply);

		const int uniqueId = data.readInt32();
		const String8 engineFile = data.readString8();
		status_t status = installDrmEngine(uniqueId, engineFile);

		reply->writeInt32(status);
		return DRM_NO_ERROR;
		}

		case GET_CONSTRAINTS_FROM_CONTENT:
		{
		ALOGV("BnDrmManagerService::onTransact :GET_CONSTRAINTS_FROM_CONTENT");

+0 −15

Original line number	Diff line number	Diff line
		@@ -185,21 +185,6 @@ DrmMetadata* DrmManager::getMetadata(int uniqueId, const String8* path) {
		return NULL;
		}

		status_t DrmManager::installDrmEngine(int uniqueId, const String8& absolutePath) {
		Mutex::Autolock _l(mLock);
		mPlugInManager.loadPlugIn(absolutePath);

		IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(absolutePath);
		rDrmEngine.initialize(uniqueId);
		rDrmEngine.setOnInfoListener(uniqueId, this);

		DrmSupportInfo* info = rDrmEngine.getSupportInfo(0);
		mSupportInfoToPlugInIdMap.add(*info, absolutePath);
		delete info;

		return DRM_NO_ERROR;
		}

		bool DrmManager::canHandle(int uniqueId, const String8& path, const String8& mimeType) {
		Mutex::Autolock _l(mLock);
		const String8 plugInId = getSupportedPlugInId(mimeType);

+0 −5

Original line number	Diff line number	Diff line
		@@ -87,11 +87,6 @@ status_t DrmManagerService::setDrmServiceListener(
		return DRM_NO_ERROR;
		}

		status_t DrmManagerService::installDrmEngine(int uniqueId, const String8& drmEngineFile) {
		ALOGV("Entering installDrmEngine");
		return mDrmManager->installDrmEngine(uniqueId, drmEngineFile);
		}

		DrmConstraints* DrmManagerService::getConstraints(
		int uniqueId, const String8* path, const int action) {
		ALOGV("Entering getConstraints from content");

+0 −9

Original line number	Diff line number	Diff line
		@@ -86,15 +86,6 @@ status_t DrmManagerClientImpl::setOnInfoListener(
		(NULL != infoListener.get()) ? this : NULL);
		}

		status_t DrmManagerClientImpl::installDrmEngine(
		int uniqueId, const String8& drmEngineFile) {
		status_t status = DRM_ERROR_UNKNOWN;
		if (EMPTY_STRING != drmEngineFile) {
		status = getDrmManagerService()->installDrmEngine(uniqueId, drmEngineFile);
		}
		return status;
		}

		DrmConstraints* DrmManagerClientImpl::getConstraints(
		int uniqueId, const String8* path, const int action) {
		DrmConstraints *drmConstraints = NULL;

+0 −2

Original line number	Diff line number	Diff line
		@@ -70,8 +70,6 @@ public:
		status_t setDrmServiceListener(
		int uniqueId, const sp<IDrmServiceListener>& drmServiceListener);

		status_t installDrmEngine(int uniqueId, const String8& drmEngineFile);

		DrmConstraints* getConstraints(int uniqueId, const String8* path, const int action);

		DrmMetadata* getMetadata(int uniqueId, const String8* path);