Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

This commit is contained in:
Adam Lesinski
2014-06-06 21:13:15 +00:00
committed by Android (Google) Code Review

View File

@ -233,7 +233,7 @@ static void android_drm_DrmManagerClient_setListeners(
static void android_drm_DrmManagerClient_release( static void android_drm_DrmManagerClient_release(
JNIEnv* env, jobject thiz, jint uniqueId) { JNIEnv* env, jobject thiz, jint uniqueId) {
ALOGV("release - Enter"); ALOGV("release - Enter");
DrmManagerClientImpl::remove(uniqueId); getDrmManagerClientImpl(env, thiz)->remove(uniqueId);
getDrmManagerClientImpl(env, thiz)->setOnInfoListener(uniqueId, NULL); getDrmManagerClientImpl(env, thiz)->setOnInfoListener(uniqueId, NULL);
sp<DrmManagerClientImpl> oldClient = setDrmManagerClientImpl(env, thiz, NULL); sp<DrmManagerClientImpl> oldClient = setDrmManagerClientImpl(env, thiz, NULL);