diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-16 08:47:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-16 08:47:58 -0700 |
| commit | 725da2fbd78bf38ff71bdbe9e1f27667dbf0fa73 (patch) | |
| tree | cdd93a104105f2cdd11ddf9343130057f5c95bba | |
| parent | be49d8c1ec074ef27c5c49f1dd7b51e236f96bdb (diff) | |
| parent | 62ea8820f20d39767fd8472d8f1458edca3dcf0f (diff) | |
| download | android_packages_apps_Gallery2-725da2fbd78bf38ff71bdbe9e1f27667dbf0fa73.tar.gz android_packages_apps_Gallery2-725da2fbd78bf38ff71bdbe9e1f27667dbf0fa73.tar.bz2 android_packages_apps_Gallery2-725da2fbd78bf38ff71bdbe9e1f27667dbf0fa73.zip | |
Merge "Gallery2 : Video share option is not working"
| -rw-r--r-- | src/com/android/gallery3d/data/LocalVideo.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/data/LocalVideo.java b/src/com/android/gallery3d/data/LocalVideo.java index 98ae18d0b..7fafe97ae 100644 --- a/src/com/android/gallery3d/data/LocalVideo.java +++ b/src/com/android/gallery3d/data/LocalVideo.java @@ -190,15 +190,17 @@ public class LocalVideo extends LocalMediaItem { @Override public int getSupportedOperations() { - int operation = SUPPORT_DELETE | SUPPORT_PLAY | SUPPORT_INFO | SUPPORT_TRIM | SUPPORT_MUTE; if (DrmHelper.isDrmFile(getFilePath())) { - operation |= SUPPORT_DRM_INFO; + int operation = SUPPORT_DELETE | SUPPORT_PLAY | SUPPORT_INFO + | SUPPORT_DRM_INFO; if (DrmHelper.isShareableDrmFile(getFilePath())) { operation |= SUPPORT_SHARE; } + return operation; } - return operation; + return SUPPORT_DELETE | SUPPORT_SHARE | SUPPORT_PLAY | SUPPORT_INFO + | SUPPORT_TRIM | SUPPORT_MUTE; } @Override |