am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
  Allow for a NoOp implementation of DrmManagerClientImpl
This commit is contained in:
Adam Lesinski
2014-06-09 21:12:25 +00:00
committed by Android Git Automerger

View File

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