Gallery2 : Uses internal Drm image decoder api in Gallery app

- Remove all previous drm implementation which is basically uses
  base bitmap decode apis to decode drm image files.
- Introduced new hidden apis on BitmapFactory and
  BitmapRegionDecoder specific to DRM content which
  is more practical to DRM framework.
- Uses DrmHelper a utility drm api library to code reusability.
- This approch will fix the issue on sharing images from
  Third party application.

CRs-fixed : 804191

Change-Id: I2e9489800c57df4fdeeb21f1548fbccc6dfbd3f9

1 files changed, 2 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/data/FilterTypeSet.java b/src/com/android/gallery3d/data/FilterTypeSet.java
index 477ef73ad..e778ceb12 100644
--- a/src/com/android/gallery3d/data/FilterTypeSet.java
+++ b/src/com/android/gallery3d/data/FilterTypeSet.java
@@ -102,7 +102,8 @@ public class FilterTypeSet extends MediaSet implements ContentListener {
         mBaseSet.enumerateMediaItems(new MediaSet.ItemConsumer() {
             @Override
             public void consume(int index, MediaItem item) {
-                if (item.getMediaType() == mMediaType) {
+                if (item.getMediaType() == mMediaType
+                        || item.getMediaType() == MediaObject.MEDIA_TYPE_DRM_IMAGE) {
                     if (index < 0 || index >= total) return;
                     Path path = item.getPath();
                     buf[index] = path;