commit f11dd63e0c5c8cf02d382351004000b243013b5f
author Narayan Kamath <narayan@google.com> Wed Dec 18 16:53:54 2013 +0000
committer Narayan Kamath <narayan@google.com> Wed Dec 18 16:58:36 2013 +0000
tree 60b710cb7f3062547ba92579fda6cf9383c79e25
parent 3da645f307695949623d78f280ce12e932eb057c

MediaDrm#mNativeContext is a long, not int.

Therefore, we must use SetLongField and not SetIntField.

Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930

media/jni/android_media_MediaDrm.cpp

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 @@
     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;
 }