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, 0 insertions, 20 deletions

diff --git a/src/com/android/gallery3d/util/GIFView.java b/src/com/android/gallery3d/util/GIFView.java
index c80625b41..86003fb31 100755
--- a/src/com/android/gallery3d/util/GIFView.java
+++ b/src/com/android/gallery3d/util/GIFView.java
@@ -6,7 +6,6 @@ import android.content.Context;
 import android.content.ContentResolver;
 import android.content.res.AssetManager;
 import android.database.Cursor;
-import android.drm.DrmHelper;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -46,19 +45,6 @@ public class GIFView extends ImageView implements GifAction {
         }
         mUri = uri;
 
-        // Let decode the GIF image from byte stream instead of file stream
-        String filepath = DrmHelper.getFilePath(mContext, mUri);
-        if (DrmHelper.isDrmFile(filepath)) {
-            byte[] bytes = DrmHelper.getDrmImageBytes(filepath);
-            DrmHelper.manageDrmLicense(mContext, this.getHandler(), filepath,
-                    "image/gif");
-            if (bytes == null) {
-                return false;
-            }
-            startDecode(bytes);
-            return true;
-        }
-
         InputStream is = getInputStream(uri);
         if (is == null || (getFileSize (is) == 0)) {
             return false;
@@ -106,12 +92,6 @@ public class GIFView extends ImageView implements GifAction {
         mGifDecoder.start();
     }
 
-    private void startDecode(byte[] bytes) {
-        freeGifDecoder();
-        mGifDecoder = new GifDecoder(bytes, this);
-        mGifDecoder.start();
-    }
-
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         if (mGifDecoder == null) {