diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-07-12 09:54:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-12 09:54:32 -0700 |
| commit | 12e807fb676fa0833cc71487b060bedefc89fa19 (patch) | |
| tree | 8b6c8f59a95a6b7cf4d98401691d9fc0318901d0 /core/java/android | |
| parent | 731e7940d246af848b8e891716e74d59adb56115 (diff) | |
| parent | fed161799bb40ea4cda19f5ef6c8c2462a0066e4 (diff) | |
| download | frameworks_base-12e807fb676fa0833cc71487b060bedefc89fa19.zip frameworks_base-12e807fb676fa0833cc71487b060bedefc89fa19.tar.gz frameworks_base-12e807fb676fa0833cc71487b060bedefc89fa19.tar.bz2 | |
Merge "MediaProvider: Add constants for media_table and media_id columns in MTP objects table"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 2c4a9f5..4bf23fc 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -274,6 +274,19 @@ public final class MediaStore { * <P>Type: INTEGER</P> */ public static final String PARENT = "parent"; + + /** + * Identifier for the media table containing the object. + * Used internally by MediaProvider + * <P>Type: INTEGER</P> + */ + public static final String MEDIA_TABLE = "media_table"; + + /** + * The ID of the object in its media table. + * <P>Type: INTEGER</P> + */ + public static final String MEDIA_ID = "media_id"; } } |