diff options
author | Paramananda <parama@codeaurora.org> | 2015-03-24 17:51:29 +0530 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-09-15 21:31:49 +0100 |
commit | 01f5f347cf33813b51bd0865dc620d001c8d8735 (patch) | |
tree | f4176c8179058a09fe95700f03273c676e593103 /src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java | |
parent | 43044da1965c1b687695f3f4e1d44d3636496978 (diff) | |
download | android_packages_apps_Gallery2-01f5f347cf33813b51bd0865dc620d001c8d8735.tar.gz android_packages_apps_Gallery2-01f5f347cf33813b51bd0865dc620d001c8d8735.tar.bz2 android_packages_apps_Gallery2-01f5f347cf33813b51bd0865dc620d001c8d8735.zip |
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
Diffstat (limited to 'src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java')
-rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlidingWindow.java | 14 |
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; |