From d3bfecb0c9bdf3651a06e86c7c8607768a29a9ae Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 23 Sep 2010 23:04:28 -0400 Subject: MTP: Reenable GetObjectPropValue and SetObjectPropValue Windows no longer chokes now that we implement the minimum set of properties BUG: 2869730 Change-Id: Ie8bd9107610b9b38f060ad8a2f05334a3b4aff9b Signed-off-by: Mike Lockwood --- media/java/android/media/MtpDatabase.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'media/java') diff --git a/media/java/android/media/MtpDatabase.java b/media/java/android/media/MtpDatabase.java index aea3af5..403ed58 100644 --- a/media/java/android/media/MtpDatabase.java +++ b/media/java/android/media/MtpDatabase.java @@ -282,9 +282,13 @@ public class MtpDatabase { return new int[] { MtpConstants.PROPERTY_STORAGE_ID, MtpConstants.PROPERTY_OBJECT_FORMAT, + MtpConstants.PROPERTY_PROTECTION_STATUS, MtpConstants.PROPERTY_OBJECT_SIZE, MtpConstants.PROPERTY_OBJECT_FILE_NAME, + MtpConstants.PROPERTY_DATE_MODIFIED, MtpConstants.PROPERTY_PARENT_OBJECT, + MtpConstants.PROPERTY_PERSISTENT_UID, + MtpConstants.PROPERTY_NAME, }; } @@ -301,6 +305,11 @@ public class MtpDatabase { String column = null; boolean isString = false; + // temporary hack + if (property == MtpConstants.PROPERTY_NAME) { + property = MtpConstants.PROPERTY_OBJECT_FILE_NAME; + } + switch (property) { case MtpConstants.PROPERTY_STORAGE_ID: outIntValue[0] = mStorageID; -- cgit v1.1