It seems that there is no quarantee that "onActivityResult()" will be called

before "onStart()". So, adding code to handle both situations. Also add
checking on "mPaused" in showOnScreenControls().

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java
index af17ca8..68c129c 100644
--- a/src/com/android/camera/ViewImage.java
+++ b/src/com/android/camera/ViewImage.java
@@ -176,6 +176,7 @@ public class ViewImage extends Activity implements View.OnClickListener {
     }
 
     private void showOnScreenControls(final boolean autoDismiss) {
+        if (mPaused) return;
         // If the view has not been attached to the window yet, the
         // zoomButtonControls will not able to show up. So delay it until the
         // view has attached to window.
@@ -1109,6 +1110,14 @@ public class ViewImage extends Activity implements View.OnClickListener {
                     // The CropImage activity passes back the Uri of the
                     // cropped image as the Action rather than the Data.
                     mSavedUri = Uri.parse(data.getAction());
+
+                    // if onStart() runs before, then set the returned
+                    // image as currentImage.
+                    if (mAllImages != null) {
+                        Image image = mAllImages.getImageForUri(mSavedUri);
+                        mCurrentPosition = mAllImages.getImageIndex(image);
+                        setImage(mCurrentPosition);
+                    }
                 }
                 break;
         }