commit e623e00199cf38786780ce18395b7366c1ff0948
author Michael Jurka <mikejurka@google.com> Wed Oct 09 13:02:24 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 09 13:02:24 2013 -0700
tree c433a28275a0ae1bdf1bdf7e2795cce61e7ad92a
parent 7164e883689ec91469e2a8a55fdf7e671e628f3d
parent 6ea9add679cc0de8c6b132e9d0bffba75b1d4d47

am 6ea9add6: am e81400c8: Merge "Fix crash when pick an image for wallpaper" into jb-ub-now-indigo-rose

* commit '6ea9add679cc0de8c6b132e9d0bffba75b1d4d47':
  Fix crash when pick an image for wallpaper

src/com/android/launcher3/WallpaperPickerActivity.java

diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index 3992170..d3e1c7b 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -616,11 +616,11 @@
             Log.e(TAG, "Error loading thumbnail for uri=" + uri);
         }
         mWallpapersView.addView(pickedImageThumbnail, 0);
-        updateTileIndices();
 
         UriWallpaperInfo info = new UriWallpaperInfo(uri);
         pickedImageThumbnail.setTag(info);
         info.setView(pickedImageThumbnail);
+        updateTileIndices();
         pickedImageThumbnail.setOnClickListener(mThumbnailOnClickListener);
         mThumbnailOnClickListener.onClick(pickedImageThumbnail);
     }