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

2013-10-14 22:31:49 +00:00
parent 140e79bb48 f6502c316c
commit 9e91b7d5fc
1 changed files with 7 additions and 1 deletions
@@ -87,9 +87,15 @@ public class WallpaperCropActivity extends Activity {

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