MTP provider: Add columns for MTP ObjectInfo dataset to the MTP objects table

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

Change-Id: Ife0563ad1c3b3dbc2461e1a9e784cbb4653b3435
This commit is contained in:
Mike Lockwood
2010-06-08 07:33:14 -04:00
parent 1ac53c3087
commit f724eed566
4 changed files with 375 additions and 10 deletions

View File

@@ -126,18 +126,39 @@ public final class MtpCursor extends AbstractWindowedCursor {
}
/* Device Column IDs */
private static final int DEVICE_ROW_ID = 1;
/* These must match the values in MtpCursor.cpp */
private static final int DEVICE_ROW_ID = 1;
private static final int DEVICE_MANUFACTURER = 2;
private static final int DEVICE_MODEL = 3;
/* Storage Column IDs */
/* These must match the values in MtpCursor.cpp */
private static final int STORAGE_ROW_ID = 101;
private static final int STORAGE_IDENTIFIER = 102;
private static final int STORAGE_DESCRIPTION = 103;
/* Object Column IDs */
private static final int OBJECT_ROW_ID = 201;
private static final int OBJECT_NAME = 202;
/* These must match the values in MtpCursor.cpp */
private static final int OBJECT_ROW_ID = 201;
private static final int OBJECT_STORAGE_ID = 202;
private static final int OBJECT_FORMAT = 203;
private static final int OBJECT_PROTECTION_STATUS = 204;
private static final int OBJECT_SIZE = 205;
private static final int OBJECT_THUMB_FORMAT = 206;
private static final int OBJECT_THUMB_SIZE = 207;
private static final int OBJECT_THUMB_WIDTH = 208;
private static final int OBJECT_THUMB_HEIGHT = 209;
private static final int OBJECT_IMAGE_WIDTH = 210;
private static final int OBJECT_IMAGE_HEIGHT = 211;
private static final int OBJECT_IMAGE_DEPTH = 212;
private static final int OBJECT_PARENT = 213;
private static final int OBJECT_ASSOCIATION_TYPE = 214;
private static final int OBJECT_ASSOCIATION_DESC = 215;
private static final int OBJECT_SEQUENCE_NUMBER = 216;
private static final int OBJECT_NAME = 217;
private static final int OBJECT_DATE_CREATED = 218;
private static final int OBJECT_DATE_MODIFIED = 219;
private static final int OBJECT_KEYWORDS = 220;
private static HashMap<String, Integer> sDeviceProjectionMap;
private static HashMap<String, Integer> sStorageProjectionMap;
@@ -156,6 +177,26 @@ public final class MtpCursor extends AbstractWindowedCursor {
sObjectProjectionMap = new HashMap<String, Integer>();
sObjectProjectionMap.put(Mtp.Object._ID, new Integer(OBJECT_ROW_ID));
sObjectProjectionMap.put(Mtp.Object.STORAGE_ID, new Integer(OBJECT_STORAGE_ID));
sObjectProjectionMap.put(Mtp.Object.FORMAT, new Integer(OBJECT_FORMAT));
sObjectProjectionMap.put(Mtp.Object.PROTECTION_STATUS, new Integer(OBJECT_PROTECTION_STATUS));
sObjectProjectionMap.put(Mtp.Object.SIZE, new Integer(OBJECT_SIZE));
sObjectProjectionMap.put(Mtp.Object.THUMB_FORMAT, new Integer(OBJECT_THUMB_FORMAT));
sObjectProjectionMap.put(Mtp.Object.THUMB_SIZE, new Integer(OBJECT_THUMB_SIZE));
sObjectProjectionMap.put(Mtp.Object.THUMB_WIDTH, new Integer(OBJECT_THUMB_WIDTH));
sObjectProjectionMap.put(Mtp.Object.THUMB_HEIGHT, new Integer(OBJECT_THUMB_HEIGHT));
sObjectProjectionMap.put(Mtp.Object.IMAGE_WIDTH, new Integer(OBJECT_IMAGE_WIDTH));
sObjectProjectionMap.put(Mtp.Object.IMAGE_HEIGHT, new Integer(OBJECT_IMAGE_HEIGHT));
sObjectProjectionMap.put(Mtp.Object.IMAGE_DEPTH, new Integer(OBJECT_IMAGE_DEPTH));
sObjectProjectionMap.put(Mtp.Object.PARENT, new Integer(OBJECT_PARENT));
sObjectProjectionMap.put(Mtp.Object.ASSOCIATION_TYPE, new Integer(OBJECT_ASSOCIATION_TYPE));
sObjectProjectionMap.put(Mtp.Object.ASSOCIATION_DESC, new Integer(OBJECT_ASSOCIATION_DESC));
sObjectProjectionMap.put(Mtp.Object.SEQUENCE_NUMBER, new Integer(OBJECT_SEQUENCE_NUMBER));
sObjectProjectionMap.put(Mtp.Object.NAME, new Integer(OBJECT_NAME));
sObjectProjectionMap.put(Mtp.Object.DATE_CREATED, new Integer(OBJECT_DATE_CREATED));
sObjectProjectionMap.put(Mtp.Object.DATE_MODIFIED, new Integer(OBJECT_DATE_MODIFIED));
sObjectProjectionMap.put(Mtp.Object.KEYWORDS, new Integer(OBJECT_KEYWORDS));
sObjectProjectionMap.put(Mtp.Object.NAME, new Integer(OBJECT_NAME));
}