Merge change 24648 into eclair

* changes:
  Add messages to help debug 2113527.

2 files changed, 12 insertions, 0 deletions

diff --git a/src/com/android/camera/ImageManager.java b/src/com/android/camera/ImageManager.java
index 0b46da5..225a249 100644
--- a/src/com/android/camera/ImageManager.java
+++ b/src/com/android/camera/ImageManager.java
@@ -97,6 +97,12 @@ public class ImageManager {
             mIsEmptyImageList = (in.readInt() != 0);
         }
 
+        public String toString() {
+            return String.format("ImageListParam{loc=%s,inc=%d,sort=%d," +
+                "bucket=%s,empty=%b,single=%s}", mLocation, mInclusion,
+                mSort, mBucketId, mIsEmptyImageList, mSingleImageUri);
+        }
+
         public static final Parcelable.Creator CREATOR
                 = new Parcelable.Creator() {
             public ImageListParam createFromParcel(Parcel in) {
diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java
index d2ac7e3..6cdab09 100644
--- a/src/com/android/camera/ViewImage.java
+++ b/src/com/android/camera/ViewImage.java
@@ -885,6 +885,8 @@ public class ViewImage extends Activity implements View.OnClickListener {
 
     private boolean init(Uri uri) {
         if (uri == null) return false;
+        Log.d(TAG, "init: uri = " + uri +
+                ", mParam = " + mParam);
         mAllImages = (mParam == null)
                 ? buildImageListFromUri(uri)
                 : ImageManager.makeImageList(getContentResolver(), mParam);
@@ -1051,12 +1053,16 @@ public class ViewImage extends Activity implements View.OnClickListener {
                 if (resultCode == RESULT_OK) {
                     // The CropImage activity passes back the Uri of the
                     // cropped image as the Action rather than the Data.
+                    Log.d(TAG, "mSavedUri was " + mSavedUri);
                     mSavedUri = Uri.parse(data.getAction());
 
                     // if onStart() runs before, then set the returned
                     // image as currentImage.
                     if (mAllImages != null) {
                         IImage image = mAllImages.getImageForUri(mSavedUri);
+                        Log.d(TAG, "data.getAction() = " + data.getAction() +
+                                ", mSavedUri = " + mSavedUri +
+                                ", image = " + image);
                         mCurrentPosition = mAllImages.getImageIndex(image);
                         setImage(mCurrentPosition, false);
                     }