am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

* commit '2d2d594308693af79bf5c44f0dcc30f29d2dc31a': MediaDrm#mNativeContext is a long, not int.
2013-12-19 05:01:34 -08:00
parent d938681216 2d2d594308
commit 91f6aaaf2c
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;
 }