diff options
| author | 2013-12-19 04:37:52 -0800 | |
|---|---|---|
| committer | 2013-12-19 04:37:52 -0800 | |
| commit | 2d2d594308693af79bf5c44f0dcc30f29d2dc31a (patch) | |
| tree | 4b2a5f9135efebd7a2f574fb299c2e42c5c23d18 | |
| parent | f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839 (diff) | |
| parent | f3172c623e4bb77a047262c6e7eedc4a2c2ea95a (diff) | |
am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."
* commit 'f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
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; } |