summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2013-12-18 16:53:54 +0000
committerNarayan Kamath <narayan@google.com>2013-12-18 16:58:36 +0000
commitf11dd63e0c5c8cf02d382351004000b243013b5f (patch)
tree60b710cb7f3062547ba92579fda6cf9383c79e25 /media
parent3da645f307695949623d78f280ce12e932eb057c (diff)
downloadframeworks_base-f11dd63e0c5c8cf02d382351004000b243013b5f.zip
frameworks_base-f11dd63e0c5c8cf02d382351004000b243013b5f.tar.gz
frameworks_base-f11dd63e0c5c8cf02d382351004000b243013b5f.tar.bz2
MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField. Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
Diffstat (limited to 'media')
-rw-r--r--media/jni/android_media_MediaDrm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 6d90ccb..eb7d51c 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -491,7 +491,7 @@ static sp<JDrm> setDrm(
if (old != NULL) {
old->decStrong(thiz);
}
- env->SetIntField(thiz, gFields.context, (int)drm.get());
+ env->SetLongField(thiz, gFields.context, reinterpret_cast<jlong>(drm.get()));
return old;
}