summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-12-07 18:53:50 -0800
committerMike Lockwood <lockwood@android.com>2010-12-07 18:53:50 -0800
commit9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93 (patch)
tree76fe169fd3dca881720d144a28091ee1d6e83b33 /media
parenta194cc7d8b39656c37acf93096550314a8d2101b (diff)
downloadframeworks_base-9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93.zip
frameworks_base-9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93.tar.gz
frameworks_base-9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93.tar.bz2
MTP: pass format back as default value in GetObjectPropDesc for format property
Change-Id: Icc4071af16763a613c9fb31e87dc716f1516c7d8 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media')
-rw-r--r--media/jni/android_media_MtpDatabase.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/jni/android_media_MtpDatabase.cpp b/media/jni/android_media_MtpDatabase.cpp
index fc7d86e..9bb93fd 100644
--- a/media/jni/android_media_MtpDatabase.cpp
+++ b/media/jni/android_media_MtpDatabase.cpp
@@ -933,6 +933,9 @@ MtpProperty* MyMtpDatabase::getObjectPropertyDesc(MtpObjectProperty property,
MtpProperty* result = NULL;
switch (property) {
case MTP_PROPERTY_OBJECT_FORMAT:
+ // use format as default value
+ result = new MtpProperty(property, MTP_TYPE_UINT16, false, format);
+ break;
case MTP_PROPERTY_PROTECTION_STATUS:
case MTP_PROPERTY_TRACK:
result = new MtpProperty(property, MTP_TYPE_UINT16);