diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-03-28 14:09:12 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-28 15:35:36 -0700 |
| commit | bbbc9107f02bf48505c1123cbb5bb1810572079c (patch) | |
| tree | 9dc45a0ebbeebabfbceb13a00ac994ebac2736b4 /src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | |
| parent | 741973ed5c52011444250d7b6002dd8b86ac7be3 (diff) | |
| download | android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.tar.gz android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.tar.bz2 android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.zip | |
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
Diffstat (limited to 'src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java')
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index 37f9b4339..5332ef89a 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -183,10 +183,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { ((FadeInTexture) content).isAnimating()) { renderRequestFlags |= SlotView.RENDER_MORE_FRAME; } - if ((entry.mediaType == MediaObject.MEDIA_TYPE_DRM_VIDEO) - || (entry.mediaType == MediaObject.MEDIA_TYPE_DRM_IMAGE)) { - drawDrmOverlay(canvas, width, height, entry.mediaType); - } + return renderRequestFlags; } |