diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-06-06 21:13:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-06 21:13:16 +0000 |
| commit | 4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b (patch) | |
| tree | 58711f55fe043b4f4509c37517069c3b8267cbd7 | |
| parent | 4bdc93d63e9edc7840a227ea1824f1f7ac93933e (diff) | |
| parent | 510ef1b537fece28b9f9e561f5c922d7aca8d294 (diff) | |
| download | frameworks_base-4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b.zip frameworks_base-4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b.tar.gz frameworks_base-4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b.tar.bz2 | |
Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
| -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 de8531b..d321baf 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); |