From 9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 7 Dec 2010 18:53:50 -0800
Subject: [PATCH] MTP: pass format back as default value in GetObjectPropDesc
 for format property

Change-Id: Icc4071af16763a613c9fb31e87dc716f1516c7d8
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 media/jni/android_media_MtpDatabase.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media/jni/android_media_MtpDatabase.cpp b/media/jni/android_media_MtpDatabase.cpp
index fc7d86ec9081a..9bb93fd915a45 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);