Merge "Fix build, update mock drm plugin" (ac4189aa) · Commits · e / os / android_frameworks_av

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp

+25 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,24 @@ namespace android {
		return OK;
		}

		status_t MockDrmPlugin::getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop)
		{
		Mutex::Autolock lock(mLock);
		ALOGD("MockDrmPlugin::getSecureStop()");

		// Properties used in mock test, set by cts test app returned from mock plugin
		// byte[] mock-secure-stop -> first secure stop in list

		ssize_t index = mByteArrayProperties.indexOfKey(String8("mock-secure-stop"));
		if (index < 0) {
		ALOGD("Missing 'mock-secure-stop' parameter for mock");
		return BAD_VALUE;
		} else {
		secureStop = mByteArrayProperties.valueAt(index);
		}
		return OK;
		}

		status_t MockDrmPlugin::getSecureStops(List<Vector<uint8_t> > &secureStops)
		{
		Mutex::Autolock lock(mLock);
		@@ -349,6 +367,13 @@ namespace android {
		return OK;
		}

		status_t MockDrmPlugin::releaseAllSecureStops()
		{
		Mutex::Autolock lock(mLock);
		ALOGD("MockDrmPlugin::releaseAllSecureStops()");
		return OK;
		}

		status_t MockDrmPlugin::getPropertyString(String8 const &name, String8 &value) const
		{
		ALOGD("MockDrmPlugin::getPropertyString(name=%s)", name.string());

+2 −0

Original line number	Diff line number	Diff line
		@@ -88,7 +88,9 @@ namespace android {
		status_t unprovisionDevice();

		status_t getSecureStops(List<Vector<uint8_t> > &secureStops);
		status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop);
		status_t releaseSecureStops(Vector<uint8_t> const &ssRelease);
		status_t releaseAllSecureStops();

		status_t getPropertyString(String8 const &name, String8 &value ) const;
		status_t getPropertyByteArray(String8 const &name,