commit 5ebac83e20dadf10bd4a0cee4ddf69d0ec049f98
author Mike Lockwood <lockwood@android.com> Tue Oct 12 11:33:47 2010 -0400
committer Mike Lockwood <lockwood@android.com> Tue Oct 12 12:41:58 2010 -0400
tree 4eac8b007abf9f42cef7dcb11e702b13200b5d87
parent 5684d464c09bdb50fb11889eb787a08556c2bb70

MTP: Add support for renaming files

Change-Id: I679d674eb4dae88f60165ab2850cc20eec7ceee3
Signed-off-by: Mike Lockwood <lockwood@android.com>

media/jni/android_media_MtpDatabase.cpp

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 @@
             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 @@
         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;