summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-04-08 06:39:28 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-04-08 06:39:28 -0700
commit1588d7f5686d54fb67745c029781e7629ef148c1 (patch)
treeadd0144744141e6d07232342ebb5ef28667dc612
parentc3b72e8029c3232c37d1c96db25d5d5ea04d6f91 (diff)
parente45ba22d0350a0ba7ab382bde1f0dbd72ec70675 (diff)
downloadandroid_packages_apps_Gallery2-1588d7f5686d54fb67745c029781e7629ef148c1.tar.gz
android_packages_apps_Gallery2-1588d7f5686d54fb67745c029781e7629ef148c1.tar.bz2
android_packages_apps_Gallery2-1588d7f5686d54fb67745c029781e7629ef148c1.zip
Merge "Gallery2 : Drm file can be set as wallpaper"
-rw-r--r--src/com/android/gallery3d/data/LocalImage.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java
index c4524854d..67e8071d3 100644
--- a/src/com/android/gallery3d/data/LocalImage.java
+++ b/src/com/android/gallery3d/data/LocalImage.java
@@ -257,6 +257,10 @@ public class LocalImage extends LocalMediaItem {
public int getSupportedOperations() {
int operation = SUPPORT_DELETE | SUPPORT_INFO;
if (DrmHelper.isDrmFile(getFilePath())) {
+ if (DrmHelper.isDrmFLBlocking(mApplication.getAndroidContext(),
+ getFilePath())) {
+ operation |= SUPPORT_SETAS;
+ }
operation |= SUPPORT_DRM_INFO | SUPPORT_FULL_IMAGE;
if (DrmHelper.isShareableDrmFile(getFilePath())) {
operation |= SUPPORT_SHARE;