Revert OMADRM feature.staging/cm-12.1

 * No need for this.

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

This reverts commit 6144de8cc35fdd114802545c9922a1a234af8397.

Revert "Gallery2: Make Gallery2 support OMADRM feature"

This reverts commit 9382a979292e52de5c60a39ba24688362dce8bc1.

Change-Id: I13a0d69a792aad36d7b15bc0b3c78e3f55d396bc

1 files changed, 0 insertions, 14 deletions

diff --git a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
index 641115138..8149df4b3 100644
--- a/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
+++ b/src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
@@ -24,7 +24,6 @@ import com.android.gallery3d.app.AbstractGalleryActivity;
 import com.android.gallery3d.app.AlbumSetDataLoader;
 import com.android.gallery3d.common.Utils;
 import com.android.gallery3d.data.DataSourceType;
-import com.android.gallery3d.data.LocalMediaItem;
 import com.android.gallery3d.data.MediaItem;
 import com.android.gallery3d.data.MediaObject;
 import com.android.gallery3d.data.MediaSet;
@@ -81,7 +80,6 @@ public class AlbumSetSlidingWindow implements AlbumSetDataLoader.DataListener {
         public Path setPath;
         public String title;
         public int totalCount;
-        public int mediaType;
         public int sourceType;
         public int cacheFlag;
         public int cacheStatus;
@@ -277,18 +275,6 @@ public class AlbumSetSlidingWindow implements AlbumSetDataLoader.DataListener {
         if (getDataVersion(cover) != entry.coverDataVersion) {
             entry.coverDataVersion = getDataVersion(cover);
             entry.rotation = (cover == null) ? 0 : cover.getRotation();
-
-            if (cover instanceof LocalMediaItem) {
-                String filePath = ((LocalMediaItem) cover).filePath;
-                if (filePath != null && (filePath.endsWith(".dcf") || filePath.endsWith(".dm"))) {
-                    if (entry.mediaType == MediaObject.MEDIA_TYPE_IMAGE) {
-                        entry.mediaType = MediaObject.MEDIA_TYPE_DRM_IMAGE;
-                    } else if (entry.mediaType == MediaObject.MEDIA_TYPE_VIDEO) {
-                        entry.mediaType = MediaObject.MEDIA_TYPE_DRM_VIDEO;
-                    }
-                }
-            }
-
             if (entry.coverLoader != null) {
                 entry.coverLoader.recycle();
                 entry.coverLoader = null;