diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-06-02 18:28:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-02 18:28:51 +0000 |
| commit | a0183b02e4c6f53587519b445a546192b4a20146 (patch) | |
| tree | 57f0c0cff39a55609265c7e0aca2590dab8d81cc /media | |
| parent | 1ac54ec69bfcda2638b05c7daa4300ec5749e7b8 (diff) | |
| parent | 8868d1290afd96997fef671f4a7a4c7bbf94fa1a (diff) | |
| download | frameworks_base-a0183b02e4c6f53587519b445a546192b4a20146.zip frameworks_base-a0183b02e4c6f53587519b445a546192b4a20146.tar.gz frameworks_base-a0183b02e4c6f53587519b445a546192b4a20146.tar.bz2 | |
am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_mtp_MtpDatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 37a0b08..82c0096 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -511,7 +511,7 @@ MtpResponseCode MyMtpDatabase::setObjectPropertyValue(MtpObjectHandle handle, break; } default: - ALOGE("unsupported type in getObjectPropertyValue\n"); + ALOGE("unsupported type in setObjectPropertyValue\n"); return MTP_RESPONSE_INVALID_OBJECT_PROP_FORMAT; } |