summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2012-11-12 15:17:36 -0800
committerDoris Liu <tianliu@google.com>2012-11-12 15:57:21 -0800
commit599bdd6d7de2adfc066b06e9899d860ae2697472 (patch)
tree43c7ce1b7cfff4b9885ee7e21c45abd9e92b9c82
parentfa62f816126c55fe59e1d95986210cb51347376c (diff)
downloadandroid_packages_apps_Gallery2-599bdd6d7de2adfc066b06e9899d860ae2697472.tar.gz
android_packages_apps_Gallery2-599bdd6d7de2adfc066b06e9899d860ae2697472.tar.bz2
android_packages_apps_Gallery2-599bdd6d7de2adfc066b06e9899d860ae2697472.zip
Fix UnsupportedOperationException in MediaObject
Bug: 6495745 Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index da5465b93..492cdfb81 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1024,11 +1024,16 @@ public abstract class PhotoPage extends ActivityState implements
refreshHidingMessage();
MediaItem current = mModel.getMediaItem(0);
+ // This is a shield for monkey when it clicks the action bar
+ // menu when transitioning from filmstrip to camera
+ if (current instanceof SnailItem) return true;
+ // TODO: We should check the current photo against the MediaItem
+ // that the menu was initially created for. We need to fix this
+ // after PhotoPage being refactored.
if (current == null) {
// item is not ready, ignore
return true;
}
-
int currentIndex = mModel.getCurrentIndex();
Path path = current.getPath();