summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-09-10 16:17:53 +0800
committerWu-cheng Li <wuchengli@google.com>2012-09-10 16:17:53 +0800
commitd57afb53c887891024a5dad825d88f088a598258 (patch)
tree723799b1c0aa0fc613cddb1b650ca8caa4780c3e /src
parentdf0fd9bc507780cd4594d4358e02e5547deb7c6d (diff)
downloadandroid_packages_apps_Snap-d57afb53c887891024a5dad825d88f088a598258.tar.gz
android_packages_apps_Snap-d57afb53c887891024a5dad825d88f088a598258.tar.bz2
android_packages_apps_Snap-d57afb53c887891024a5dad825d88f088a598258.zip
Do not allow panorama viewer in secure album.
bug:7053266 Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index df149b201..0dcad8152 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -794,7 +794,7 @@ public class PhotoPage extends ActivityState implements
boolean playVideo = (mSecureAlbum == null) &&
((item.getSupportedOperations() & MediaItem.SUPPORT_PLAY) != 0);
- boolean viewPanorama =
+ boolean viewPanorama = (mSecureAlbum == null) &&
(item.getSupportedOperations() & MediaItem.SUPPORT_VIEW_PANORAMA) != 0;
if (playVideo) {