Merge "provideKeyResponse to send an event to test AMediaDrm_setOnEventListener." into nyc-mr2-dev (97bcb4f3) · Commits · e / os / android_frameworks_av

drm/mediadrm/plugins/clearkey/DrmPlugin.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,8 @@ status_t DrmPlugin::provideKeyResponse(
		}
		status_t res = session->provideKeyResponse(response);
		if (res == android::OK) {
		// This is for testing AMediaDrm_setOnEventListener only.
		sendEvent(kDrmPluginEventVendorDefined, 0, &scope, NULL);
		keySetId.clear();
		}
		return res;
		@@ -90,6 +92,8 @@ status_t DrmPlugin::getPropertyString(
		value = "ClearKey CDM";
		} else if (name == "algorithms") {
		value = "";
		} else if (name == "listenerTestSupport") {
		value = "true";
		} else {
		ALOGE("App requested unknown string property %s", name.string());
		return android::ERROR_DRM_CANNOT_HANDLE;