diff options
| author | Colin Cross <ccross@android.com> | 2014-03-19 17:28:42 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-19 17:28:42 -0700 |
| commit | 5e8ff02ec93aa0f933d0082d9a0e066b552c6a80 (patch) | |
| tree | b9ed53d8bd167a4e9c500b414831d8365302de22 /media | |
| parent | 2fcce9612d32df06c8dcd3c522411f4f49ad8138 (diff) | |
| download | frameworks_base-5e8ff02ec93aa0f933d0082d9a0e066b552c6a80.zip frameworks_base-5e8ff02ec93aa0f933d0082d9a0e066b552c6a80.tar.gz frameworks_base-5e8ff02ec93aa0f933d0082d9a0e066b552c6a80.tar.bz2 | |
MediaHTTPConnection: use jlong to store native pointer
Change-Id: Ic4f391a8e658498e63c26ea2af4c7413ed387360
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaHTTPConnection.java | 2 | ||||
| -rw-r--r-- | media/jni/android_media_MediaHTTPConnection.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/java/android/media/MediaHTTPConnection.java b/media/java/android/media/MediaHTTPConnection.java index 67680a8..eb91668 100644 --- a/media/java/android/media/MediaHTTPConnection.java +++ b/media/java/android/media/MediaHTTPConnection.java @@ -269,6 +269,6 @@ public class MediaHTTPConnection extends IMediaHTTPConnection.Stub { native_init(); } - private int mNativeContext; + private long mNativeContext; } diff --git a/media/jni/android_media_MediaHTTPConnection.cpp b/media/jni/android_media_MediaHTTPConnection.cpp index c48af11..da3f74d 100644 --- a/media/jni/android_media_MediaHTTPConnection.cpp +++ b/media/jni/android_media_MediaHTTPConnection.cpp @@ -84,7 +84,7 @@ static fields_t gFields; static sp<JMediaHTTPConnection> setObject( JNIEnv *env, jobject thiz, const sp<JMediaHTTPConnection> &conn) { sp<JMediaHTTPConnection> old = - (JMediaHTTPConnection *)env->GetIntField(thiz, gFields.context); + (JMediaHTTPConnection *)env->GetLongField(thiz, gFields.context); if (conn != NULL) { conn->incStrong(thiz); @@ -92,13 +92,13 @@ static sp<JMediaHTTPConnection> setObject( if (old != NULL) { old->decStrong(thiz); } - env->SetIntField(thiz, gFields.context, (int)conn.get()); + env->SetLongField(thiz, gFields.context, (jlong)conn.get()); return old; } static sp<JMediaHTTPConnection> getObject(JNIEnv *env, jobject thiz) { - return (JMediaHTTPConnection *)env->GetIntField(thiz, gFields.context); + return (JMediaHTTPConnection *)env->GetLongField(thiz, gFields.context); } static void android_media_MediaHTTPConnection_native_init(JNIEnv *env) { |