commit 8e93c09ccdb1376718077f64d84be0e9f33dc0ac
author Michael Jurka <mikejurka@google.com> Mon Oct 14 15:33:29 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 14 15:33:29 2013 -0700
tree 0721ce8ec56cc0397e0801411fba16c0c6d81d46
parent 6eabacd4999a543f8625027e9d223335ad56eb84
parent 9e91b7d5fccebc454424657e62497016ebdc7d1e

am 9e91b7d5: Merge "Don\'t crash if WallpaperCropActivity isn\'t passed a URI" into jb-ub-now-indigo-rose

* commit '9e91b7d5fccebc454424657e62497016ebdc7d1e':
  Don't crash if WallpaperCropActivity isn't passed a URI

src/com/android/launcher3/WallpaperCropActivity.java

diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java
index 79cc88e..30ec340 100644
--- a/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/src/com/android/launcher3/WallpaperCropActivity.java
@@ -87,9 +87,15 @@
 
         mCropView = (CropView) findViewById(R.id.cropView);
 
-        Intent cropIntent = this.getIntent();
+        Intent cropIntent = getIntent();
         final Uri imageUri = cropIntent.getData();
 
+        if (imageUri == null) {
+            Log.e(LOGTAG, "No URI passed in intent, exiting WallpaperCropActivity");
+            finish();
+            return;
+        }
+
         int rotation = getRotationFromExif(this, imageUri);
         mCropView.setTileSource(new BitmapRegionTileSource(this, imageUri, 1024, rotation), null);
         mCropView.setTouchEnabled(true);