summaryrefslogtreecommitdiffstats
path: root/media/jni/android_mtp_MtpDatabase.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-06-02 18:25:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-02 18:25:35 +0000
commit8868d1290afd96997fef671f4a7a4c7bbf94fa1a (patch)
tree350b8642e2ae5917759579a20514a0c3a5b76003 /media/jni/android_mtp_MtpDatabase.cpp
parent750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da (diff)
parent1c725866da02c3e1f62fb416ea3450caed406f2a (diff)
downloadframeworks_base-8868d1290afd96997fef671f4a7a4c7bbf94fa1a.zip
frameworks_base-8868d1290afd96997fef671f4a7a4c7bbf94fa1a.tar.gz
frameworks_base-8868d1290afd96997fef671f4a7a4c7bbf94fa1a.tar.bz2
am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a': MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Diffstat (limited to 'media/jni/android_mtp_MtpDatabase.cpp')
-rw-r--r--media/jni/android_mtp_MtpDatabase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp
index f9cc481..af600e2 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;
}