diff options
| author | Elliott Hughes <enh@google.com> | 2015-09-24 17:23:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 17:23:00 +0000 |
| commit | 434a481b2191562582c79be29f24c2e0b5ca60d0 (patch) | |
| tree | 497b04c0e570371917c2a30436081944b6ee7590 /media/jni/android_mtp_MtpDevice.cpp | |
| parent | ddb59c53c3357239d8f34c25e5c5c15ef6752f4b (diff) | |
| parent | ea1831d211ea0e6b2d161c714bb0786369ef2df5 (diff) | |
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
constify JNINativeMethod function pointer tables
Diffstat (limited to 'media/jni/android_mtp_MtpDevice.cpp')
| -rw-r--r-- | media/jni/android_mtp_MtpDevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp index 2a46ee72e50c..f11329c7b258 100644 --- a/media/jni/android_mtp_MtpDevice.cpp +++ b/media/jni/android_mtp_MtpDevice.cpp @@ -490,7 +490,7 @@ android_mtp_MtpDevice_send_object_info(JNIEnv *env, jobject thiz, jobject info) // ---------------------------------------------------------------------------- -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { {"native_open", "(Ljava/lang/String;I)Z", (void *)android_mtp_MtpDevice_open}, {"native_close", "()V", (void *)android_mtp_MtpDevice_close}, |