commit 9e91b7d5fccebc454424657e62497016ebdc7d1e
author Michael Jurka <mikejurka@google.com> Mon Oct 14 22:31:49 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 14 22:31:50 2013 +0000
tree 280f5d8b8a7105a82e7651a2ad72b212ecb3281f
parent 140e79bb48f6639f2d58c729d6f2597bda0a51b1
parent f6502c316c602e44fd5a1706013d7123a9eb1022

Merge "Don't crash if WallpaperCropActivity isn't passed a URI" into jb-ub-now-indigo-rose

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);