summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-10-12 11:33:47 -0400
committerMike Lockwood <lockwood@android.com>2010-10-12 12:41:58 -0400
commit5ebac83e20dadf10bd4a0cee4ddf69d0ec049f98 (patch)
tree4eac8b007abf9f42cef7dcb11e702b13200b5d87 /media/jni
parent5684d464c09bdb50fb11889eb787a08556c2bb70 (diff)
downloadframeworks_base-5ebac83e20dadf10bd4a0cee4ddf69d0ec049f98.zip
frameworks_base-5ebac83e20dadf10bd4a0cee4ddf69d0ec049f98.tar.gz
frameworks_base-5ebac83e20dadf10bd4a0cee4ddf69d0ec049f98.tar.bz2
MTP: Add support for renaming files
Change-Id: I679d674eb4dae88f60165ab2850cc20eec7ceee3 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/android_media_MtpDatabase.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/media/jni/android_media_MtpDatabase.cpp b/media/jni/android_media_MtpDatabase.cpp
index d6bf609..8ae7984 100644
--- a/media/jni/android_media_MtpDatabase.cpp
+++ b/media/jni/android_media_MtpDatabase.cpp
@@ -804,7 +804,6 @@ MtpProperty* MyMtpDatabase::getObjectPropertyDesc(MtpObjectProperty property,
result = new MtpProperty(property, MTP_TYPE_UINT128);
break;
case MTP_PROPERTY_NAME:
- case MTP_PROPERTY_OBJECT_FILE_NAME:
case MTP_PROPERTY_DATE_MODIFIED:
case MTP_PROPERTY_DISPLAY_NAME:
case MTP_PROPERTY_DATE_ADDED:
@@ -817,6 +816,11 @@ MtpProperty* MyMtpDatabase::getObjectPropertyDesc(MtpObjectProperty property,
case MTP_PROPERTY_DESCRIPTION:
result = new MtpProperty(property, MTP_TYPE_STR);
break;
+ case MTP_PROPERTY_OBJECT_FILE_NAME:
+ // We allow renaming files but not folders
+ result = new MtpProperty(property, MTP_TYPE_STR,
+ format != MTP_FORMAT_ASSOCIATION);
+ break;
}
return result;