Merge "CryptoHal: graceful plugin creation failure" into sc-dev (2ba29909) · Commits · e / os / android_frameworks_av

drm/libmediadrm/CryptoHal.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -146,6 +146,9 @@ sp<ICryptoPlugin> CryptoHal::makeCryptoPlugin(const sp<ICryptoFactory>& factory,
		plugin = hPlugin;
		}
		);
		if (!hResult.isOk()) {
		mInitCheck = DEAD_OBJECT;
		}
		return plugin;
		}

		@@ -179,10 +182,8 @@ status_t CryptoHal::createPlugin(const uint8_t uuid[16], const void *data,
		}
		}

		if (mPlugin == NULL) {
		mInitCheck = ERROR_UNSUPPORTED;
		} else {
		mInitCheck = OK;
		if (mInitCheck == NO_INIT) {
		mInitCheck = mPlugin == NULL ? ERROR_UNSUPPORTED : OK;
		}

		return mInitCheck;