diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-06-10 01:30:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 01:30:05 +0000 |
| commit | 3cfe720a0d250f7aac88fdd303bf34005ebb9ab7 (patch) | |
| tree | 10c5d3e75c0345df432eac43e198d98a6a4383bd /drm | |
| parent | e1ab884a67ecbb3cd879493364e9eb1f485d9023 (diff) | |
| parent | 5fed49f7d614ae9e83db04703484b31c8077b78c (diff) | |
| download | frameworks_base-3cfe720a0d250f7aac88fdd303bf34005ebb9ab7.zip frameworks_base-3cfe720a0d250f7aac88fdd303bf34005ebb9ab7.tar.gz frameworks_base-3cfe720a0d250f7aac88fdd303bf34005ebb9ab7.tar.bz2 | |
am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
* commit '5fed49f7d614ae9e83db04703484b31c8077b78c':
Allow for a NoOp implementation of DrmManagerClientImpl
Diffstat (limited to 'drm')
| -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); |