diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-12-07 18:57:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-07 18:57:18 -0800 |
| commit | 7f889328b70ef863529f1e882fdd331d9d765432 (patch) | |
| tree | d9513db8d313b8cdc2a22cc3c9f47d3d82c8942d /media | |
| parent | a9e67c11c0e4be3508662b2382b6d1f19e8aa258 (diff) | |
| parent | 9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93 (diff) | |
| download | frameworks_base-7f889328b70ef863529f1e882fdd331d9d765432.zip frameworks_base-7f889328b70ef863529f1e882fdd331d9d765432.tar.gz frameworks_base-7f889328b70ef863529f1e882fdd331d9d765432.tar.bz2 | |
Merge "MTP: pass format back as default value in GetObjectPropDesc for format property"
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MtpDatabase.cpp | 3 |
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); |