diff --git a/media/jni/android_media_MtpDatabase.cpp b/media/jni/android_media_MtpDatabase.cpp
index d4539fe0f15ee..bfdc872e9f974 100644
--- a/media/jni/android_media_MtpDatabase.cpp
+++ b/media/jni/android_media_MtpDatabase.cpp
@@ -333,7 +333,7 @@ struct PropertyTableEntry {
 static const PropertyTableEntry   kPropertyTable[] = {
     {   MTP_PROPERTY_PARENT_OBJECT,     MTP_TYPE_UINT32 },
     {   MTP_PROPERTY_STORAGE_ID,        MTP_TYPE_UINT32 },
-    {   MTP_PROPERTY_OBJECT_FORMAT,     MTP_TYPE_UINT32 },
+    {   MTP_PROPERTY_OBJECT_FORMAT,     MTP_TYPE_UINT16 },
     {   MTP_PROPERTY_OBJECT_FILE_NAME,  MTP_TYPE_STR    },
     {   MTP_PROPERTY_OBJECT_SIZE,       MTP_TYPE_UINT64 },
     {   MTP_PROPERTY_DATE_MODIFIED,     MTP_TYPE_STR    },
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index 5f5cadfd98ac0..082d924122f6c 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -268,7 +268,7 @@ void MtpServer::sendObjectRemoved(MtpObjectHandle handle) {
 }
 
 void MtpServer::initObjectProperties() {
-    mObjectProperties.push(new MtpProperty(MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT16));
+    mObjectProperties.push(new MtpProperty(MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32));
     mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16));
     mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_SIZE, MTP_TYPE_UINT64));
     mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_FILE_NAME, MTP_TYPE_STR));
diff --git a/media/mtp/mtp.h b/media/mtp/mtp.h
index 224cfb9c26ec2..b7afa66393263 100644
--- a/media/mtp/mtp.h
+++ b/media/mtp/mtp.h
@@ -465,8 +465,8 @@
 
 // Storage Access Capability
 #define MTP_STORAGE_READ_WRITE                      0x0000
-#define MTP_STORAGE_READ_ONLY_WITHOUT_DELETE        0x0000
-#define MTP_STORAGE_READ_ONLY_WITH_DELETE           0x0000
+#define MTP_STORAGE_READ_ONLY_WITHOUT_DELETE        0x0001
+#define MTP_STORAGE_READ_ONLY_WITH_DELETE           0x0002
 
 // Association Type
 #define MTP_ASSOCIATION_TYPE_UNDEFINED              0x0000