diff options
| author | 2013-12-19 13:04:19 +0000 | |
|---|---|---|
| committer | 2013-12-19 13:04:19 +0000 | |
| commit | 7bbc79fd68ea358891ef7e7fa758c009491c4ea0 (patch) | |
| tree | 621c658f8e7beba4506ccd672996598c6400e34f | |
| parent | ee767548ba2b4d70e7c7bdc6c56dc0c6634e85d3 (diff) | |
| parent | 91f6aaaf2cb1c1a0cec129cec8038332de0271a8 (diff) | |
am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
* commit '91f6aaaf2cb1c1a0cec129cec8038332de0271a8':
MediaDrm#mNativeContext is a long, not int.
| -rw-r--r-- | media/jni/android_media_MediaDrm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 6d90ccb213b0..eb7d51c7ca0a 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; } |