diff options
author | Bobby Georgescu <georgescu@google.com> | 2013-01-07 11:25:46 -0800 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2013-01-07 11:25:46 -0800 |
commit | 617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25 (patch) | |
tree | 603ce9871a195fbf85babf8c64a6d2123b177123 /src | |
parent | ff6b23e655883f8f42bcf5c806f594512beaa322 (diff) | |
download | android_packages_apps_Gallery2-617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25.tar.gz android_packages_apps_Gallery2-617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25.tar.bz2 android_packages_apps_Gallery2-617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25.zip |
Fix camera->gallery relaunch loop on empty camera album
Bug: 7952132
Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 2 |
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 ca3ee19ab..852023441 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -345,7 +345,7 @@ public abstract class PhotoPage extends ActivityState implements } if (stayedOnCamera) { - if (mAppBridge == null) { + if (mAppBridge == null && mMediaSet.getTotalMediaItemCount() > 1) { launchCamera(); /* We got here by swiping from photo 1 to the placeholder, so make it be the thing that |