am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

* commit 'ad1ff47213e1b3a34a2b9e5a189742e9a15ed486': MediaDrm#mNativeContext is a long, not int.
2013-12-19 13:14:17 +00:00
parent 69d251383f ad1ff47213
commit 8907644bb6
1 changed files with 1 additions and 1 deletions
--- 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;
 }