Gallery2: Revert DRM feature

 * Missing framework support in M, revisit later.

Revert "Gallery2 : Drm file can be set as wallpaper"

This reverts commit b00985f4de70444fa5ece9e8a78a79e73f4475b1.

Revert "Gallery2 : Drm lock icon added on Photo widget for drm content"

This reverts commit 4f3e49619d3954056f899660cc764f3773d92141.

Revert "Gallery2 : GIF animated drm file can be visible in Gallery app"

This reverts commit f5b491b181839286f58d640ae690f1860ef19e8c.

Revert "Gallery2 : Delete and Details options are not visible on Camera preview"

This reverts commit 704bff736bda2bc5f6c5aa2956879f55101191f5.

Revert "Gallery2 : Video share option is not working"

This reverts commit ea87a93df185b9f8c1e477188b55a2fe97dc983e.

Revert "Gallery2 : Uses internal Drm image decoder api in Gallery app"

This reverts commit 01f5f347cf33813b51bd0865dc620d001c8d8735.

Revert "Gallery2 : Added support for Oma drm (CD and SD)"

This reverts commit 43044da1965c1b687695f3f4e1d44d3636496978.

Revert "Gallery2: Make Gallery2 support OMADRM feature"

This reverts commit 829f9ad8c06070038cdef24e5fac76a8a16f841b.

Change-Id: I4300285fd8539eb2e3134a0e472a087b83a0228f

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;
     }