diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-06-09 21:12:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 21:12:25 +0000 |
| commit | 5fed49f7d614ae9e83db04703484b31c8077b78c (patch) | |
| tree | d3c7816419fa05eb643c45ba476bb698f2790d70 /drm/jni/android_drm_DrmManagerClient.cpp | |
| parent | 1e6706abb23cd1196a7ef9dd1cc1939220ef7169 (diff) | |
| parent | 4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b (diff) | |
am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
Allow for a NoOp implementation of DrmManagerClientImpl
Diffstat (limited to 'drm/jni/android_drm_DrmManagerClient.cpp')
| -rw-r--r-- | drm/jni/android_drm_DrmManagerClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/jni/android_drm_DrmManagerClient.cpp b/drm/jni/android_drm_DrmManagerClient.cpp index de8531b74571..d321baf68b46 100644 --- a/drm/jni/android_drm_DrmManagerClient.cpp +++ b/drm/jni/android_drm_DrmManagerClient.cpp @@ -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); |