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, 3 insertions, 13 deletions

diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java
index 2b15ab96e..174058dc8 100644
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -16,12 +16,8 @@
 
 package com.android.gallery3d.app;
 
-import java.util.ArrayList;
-import java.util.Random;
-
 import android.app.Activity;
 import android.content.Intent;
-import android.drm.DrmHelper;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Handler;
@@ -42,6 +38,9 @@ import com.android.gallery3d.ui.SynchronizedHandler;
 import com.android.gallery3d.util.Future;
 import com.android.gallery3d.util.FutureListener;
 
+import java.util.ArrayList;
+import java.util.Random;
+
 public class SlideshowPage extends ActivityState {
     private static final String TAG = "SlideshowPage";
 
@@ -339,15 +338,6 @@ public class SlideshowPage extends ActivityState {
                 mData = mMediaSet.getMediaItem(index, DATA_SIZE);
                 mDataStart = index;
                 dataEnd = index + mData.size();
-
-                // Consume license once in each element of the slide-show
-                // This is a non-blocking loop operation
-                for (int i = 0; i < mData.size(); i++) {
-                    String path = mData.get(i).getFilePath();
-                    if (DrmHelper.isDrmFile(path)) {
-                        DrmHelper.consumeDrmRights(path, "image/*");
-                    }
-                }
             }
 
             return (index < mDataStart || index >= dataEnd) ? null : mData.get(index - mDataStart);