OSDN Git Service

Do not allow panorama viewer in secure album.
authorWu-cheng Li <wuchengli@google.com>
Mon, 10 Sep 2012 08:17:53 +0000 (16:17 +0800)
committerWu-cheng Li <wuchengli@google.com>
Mon, 10 Sep 2012 08:17:53 +0000 (16:17 +0800)
bug:7053266
Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9

src/com/android/gallery3d/app/PhotoPage.java

index df149b2..0dcad81 100644 (file)
@@ -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) {