am aa671a84: am 2fe1530c: Fix NPE

* commit 'aa671a8465ea3f113ac3efcae8214c32e04f79cd': Fix NPE
2013-10-04 12:39:57 -07:00
parent b485c99587 aa671a8465
commit 216c0fd96d
1 changed files with 4 additions and 2 deletions
@@ -554,8 +554,10 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        if (requestCode == IMAGE_PICK && resultCode == RESULT_OK) {
-            Uri uri = data.getData();
-            addTemporaryWallpaperTile(uri);
+            if (data != null && data.getData() != null) {
+                Uri uri = data.getData();
+                addTemporaryWallpaperTile(uri);
+            }
        } else if (requestCode == PICK_WALLPAPER_THIRD_PARTY_ACTIVITY) {
            setResult(RESULT_OK);
            finish();