diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-01-07 12:59:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-07 12:59:00 -0800 |
| commit | 3114fa3a8a99be3c819d102dd1d069face13c43f (patch) | |
| tree | ed37a377f95d7db3ede715ea40ed0d3ce09286c5 /src/com/android/gallery3d | |
| parent | e03c6dfb597f66735afa0c09d11ce2232c0d105b (diff) | |
| parent | 617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25 (diff) | |
| download | android_packages_apps_Gallery2-3114fa3a8a99be3c819d102dd1d069face13c43f.tar.gz android_packages_apps_Gallery2-3114fa3a8a99be3c819d102dd1d069face13c43f.tar.bz2 android_packages_apps_Gallery2-3114fa3a8a99be3c819d102dd1d069face13c43f.zip | |
Merge "Fix camera->gallery relaunch loop on empty camera album" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d')
| -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 |