Merge "Return error to NDK on failure" into sc-dev (88c5b4e1) · Commits · e / os / android_frameworks_av

media/ndk/NdkMediaDrm.cpp

+9 −5

Original line number	Diff line number	Diff line
		@@ -380,12 +380,15 @@ media_status_t AMediaDrm_openSession(AMediaDrm mObj, AMediaDrmSessionId sessio
		}
		Vector<uint8_t> session;
		status_t status = mObj->mDrm->openSession(DrmPlugin::kSecurityLevelMax, session);
		if (status == OK) {
		if (status != OK) {
		sessionId->ptr = NULL;
		sessionId->length = 0;
		return translateStatus(status);
		}
		mObj->mIds.push_front(session);
		List<idvec_t>::iterator iter = mObj->mIds.begin();
		sessionId->ptr = iter->array();
		sessionId->length = iter->size();
		}
		return AMEDIA_OK;
		}

		@@ -489,6 +492,7 @@ media_status_t AMediaDrm_provideKeyResponse(AMediaDrm *mObj, const AMediaDrmScop
		} else {
		keySetId->ptr = NULL;
		keySetId->length = 0;
		return translateStatus(status);
		}
		return AMEDIA_OK;
		}