diff options
Diffstat (limited to 'src/com/android/gallery3d/data/MediaObject.java')
| -rw-r--r-- | src/com/android/gallery3d/data/MediaObject.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/com/android/gallery3d/data/MediaObject.java b/src/com/android/gallery3d/data/MediaObject.java index 68a58ea70..530ee306e 100644 --- a/src/com/android/gallery3d/data/MediaObject.java +++ b/src/com/android/gallery3d/data/MediaObject.java @@ -42,15 +42,12 @@ public abstract class MediaObject { public static final int SUPPORT_CAMERA_SHORTCUT = 1 << 15; public static final int SUPPORT_MUTE = 1 << 16; public static final int SUPPORT_PRINT = 1 << 17; - public static final int SUPPORT_DRM_INFO = 1 << 18; public static final int SUPPORT_ALL = 0xffffffff; // These are the bits returned from getMediaType(): public static final int MEDIA_TYPE_UNKNOWN = 1; public static final int MEDIA_TYPE_IMAGE = 2; public static final int MEDIA_TYPE_VIDEO = 4; - public static final int MEDIA_TYPE_DRM_VIDEO = 5; - public static final int MEDIA_TYPE_DRM_IMAGE = 6; public static final int MEDIA_TYPE_ALL = MEDIA_TYPE_IMAGE | MEDIA_TYPE_VIDEO; public static final String MEDIA_TYPE_IMAGE_STRING = "image"; @@ -69,7 +66,7 @@ public abstract class MediaObject { public static final int CACHE_STATUS_CACHED_FULL = 3; private static long sVersionSerial = 0; - protected boolean consumeRights = false; + protected long mDataVersion; protected final Path mPath; @@ -148,14 +145,6 @@ public abstract class MediaObject { throw new UnsupportedOperationException(); } - public void setConsumeRights(boolean flag) { - throw new UnsupportedOperationException(); - } - - public boolean getConsumeRights() { - throw new UnsupportedOperationException(); - } - public static synchronized long nextVersionNumber() { return ++MediaObject.sVersionSerial; } |