From 617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25 Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Mon, 7 Jan 2013 11:25:46 -0800 Subject: [PATCH] Fix camera->gallery relaunch loop on empty camera album Bug: 7952132 Change-Id: I27325abe32177195d07fe310b8c49aca81af9056 --- src/com/android/gallery3d/app/PhotoPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.11.0