diff options
Diffstat (limited to 'src/com/android/gallery3d/data/LocalVideo.java')
-rw-r--r-- | src/com/android/gallery3d/data/LocalVideo.java | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java index 7fafe97ae..4b8774ca4 100644 --- a/src/com/android/gallery3d/data/LocalVideo.java +++ b/src/com/android/gallery3d/data/LocalVideo.java @@ -18,7 +18,6 @@ package com.android.gallery3d.data; import android.content.ContentResolver; import android.database.Cursor; -import android.drm.DrmHelper; import android.graphics.Bitmap; import android.graphics.BitmapRegionDecoder; import android.net.Uri; @@ -154,7 +153,7 @@ public class LocalVideo extends LocalMediaItem { @Override public Job<Bitmap> requestImage(int type) { return new LocalVideoRequest(mApplication, getPath(), dateModifiedInSec, - type, filePath, mimeType); + type, filePath); } public static class LocalVideoRequest extends ImageCacheRequest { @@ -167,13 +166,6 @@ public class LocalVideo extends LocalMediaItem { mLocalFilePath = localFilePath; } - LocalVideoRequest(GalleryApp application, Path path, long timeModified, - int type, String localFilePath, String mimeType) { - super(application, path, timeModified, type, - MediaItem.getTargetSize(type), localFilePath, mimeType); - mLocalFilePath = localFilePath; - } - @Override public Bitmap onDecodeOriginal(JobContext jc, int type) { Bitmap bitmap = BitmapUtils.createVideoThumbnail(mLocalFilePath); @@ -190,17 +182,7 @@ public class LocalVideo extends LocalMediaItem { @Override public int getSupportedOperations() { - if (DrmHelper.isDrmFile(getFilePath())) { - int operation = SUPPORT_DELETE | SUPPORT_PLAY | SUPPORT_INFO - | SUPPORT_DRM_INFO; - if (DrmHelper.isShareableDrmFile(getFilePath())) { - operation |= SUPPORT_SHARE; - } - return operation; - } - - return SUPPORT_DELETE | SUPPORT_SHARE | SUPPORT_PLAY | SUPPORT_INFO - | SUPPORT_TRIM | SUPPORT_MUTE; + return SUPPORT_DELETE | SUPPORT_SHARE | SUPPORT_PLAY | SUPPORT_INFO | SUPPORT_TRIM | SUPPORT_MUTE; } @Override @@ -229,10 +211,6 @@ public class LocalVideo extends LocalMediaItem { @Override public int getMediaType() { - if (DrmHelper.isDrmFile(getFilePath())) { - return MEDIA_TYPE_DRM_VIDEO; - } - return MEDIA_TYPE_VIDEO; } |