Skip to content

Commit

Permalink
am 5fed49f: am 4d9fcae: Merge "Allow for a NoOp implementation of Drm…
Browse files Browse the repository at this point in the history
…ManagerClientImpl" into klp-modular-dev

* commit '5fed49f7d614ae9e83db04703484b31c8077b78c':
  Allow for a NoOp implementation of DrmManagerClientImpl
  • Loading branch information
Adam Lesinski authored and Android Git Automerger committed Jun 10, 2014
2 parents e1ab884 + 5fed49f commit 3cfe720
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drm/jni/android_drm_DrmManagerClient.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit 3cfe720

Please sign in to comment.