summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-01-16 02:44:03 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-16 02:44:03 -0800
commit917a4f7267da619e39bb8a06ec6f2e0e8c828699 (patch)
tree917f6feb28604f4d9ac806b81db2d803abe33164
parentc300a39b471a09670f4e3c738b5a7eb7a37c3ac1 (diff)
parent078fa1b9f59dd8d6b72b3d86f0274c6ff0f20a27 (diff)
downloadandroid_packages_apps_Gallery2-917a4f7267da619e39bb8a06ec6f2e0e8c828699.tar.gz
android_packages_apps_Gallery2-917a4f7267da619e39bb8a06ec6f2e0e8c828699.tar.bz2
android_packages_apps_Gallery2-917a4f7267da619e39bb8a06ec6f2e0e8c828699.zip
Merge "Gallery2: Set read only image unEditable"
-rwxr-xr-xsrc/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 bfd4528e4..07a07508d 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -819,7 +819,7 @@ public abstract class PhotoPage extends ActivityState implements
int supportedOperations = mCurrentPhoto.getSupportedOperations();
if (mReadOnlyView) {
- supportedOperations ^= MediaObject.SUPPORT_EDIT;
+ supportedOperations &= ~MediaObject.SUPPORT_EDIT;
}
if (mSecureAlbum != null) {
supportedOperations &= MediaObject.SUPPORT_DELETE;