commit fa2e16e36d95d5cf0848a28a98ac4566321fc119
author Narayan Kamath <narayan@google.com> Thu Jan 30 02:34:38 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 30 02:34:38 2014 -0800
tree 18a6c05a038d181c08d803298dd2b8473623c405
parent cb7cdd5053ab37e3b606eb313e8b482a2047091a
parent 54190ec8307ebb83d02b7d9b8edc80a042792de6

am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit '54190ec8307ebb83d02b7d9b8edc80a042792de6':
  change Surface constructor arg to 64bit

core/jni/android_view_Surface.cpp

diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index 3342bab..c2d4ec0 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -113,7 +113,8 @@
         return NULL;
     }
 
-    jobject surfaceObj = env->NewObject(gSurfaceClassInfo.clazz, gSurfaceClassInfo.ctor, surface.get());
+    jobject surfaceObj = env->NewObject(gSurfaceClassInfo.clazz,
+            gSurfaceClassInfo.ctor, (jlong)surface.get());
     if (surfaceObj == NULL) {
         if (env->ExceptionCheck()) {
             ALOGE("Could not create instance of Surface from IGraphicBufferProducer.");