summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-10-15 16:43:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-15 16:43:56 -0700
commit0cd81d768c23d9499209994571138d4f62892aa8 (patch)
treed21a04843d6f088882f2c20511e8c8c2938e8dd0
parent5431fa9123df65fc476a3666134c431a79349d7d (diff)
parent06c349afaff1957f7bc7550f30b8b27ad05730df (diff)
downloadandroid_packages_apps_Snap-0cd81d768c23d9499209994571138d4f62892aa8.tar.gz
android_packages_apps_Snap-0cd81d768c23d9499209994571138d4f62892aa8.tar.bz2
android_packages_apps_Snap-0cd81d768c23d9499209994571138d4f62892aa8.zip
am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
* commit 'c42bb220434926c23332c0f93baad4ca2c6b7588': Cherry-pick of 092fd92 to fix bug 7344730 also.
-rw-r--r--src/com/android/gallery3d/data/MediaObject.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/MediaObject.java b/src/com/android/gallery3d/data/MediaObject.java
index 1fdf8a216..14cd5242a 100644
--- a/src/com/android/gallery3d/data/MediaObject.java
+++ b/src/com/android/gallery3d/data/MediaObject.java
@@ -100,7 +100,7 @@ public abstract class MediaObject {
}
public int getSupportedOperations(boolean getAll) {
- return 0;
+ return getSupportedOperations();
}
public void setSupportedOperationsListener(SupportedOperationsListener l) {