commit 216c0fd96d9038fd447d0bf8548187ed5ef9b952
author Michael Jurka <mikejurka@google.com> Fri Oct 04 12:39:57 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 04 12:39:57 2013 -0700
tree 30718451701c90294b696f521384708e8113806a
parent b485c9958754bf132e84e3c5019b484951c351e1
parent aa671a8465ea3f113ac3efcae8214c32e04f79cd

am aa671a84: am 2fe1530c: Fix NPE

* commit 'aa671a8465ea3f113ac3efcae8214c32e04f79cd':
  Fix NPE

src/com/android/launcher3/WallpaperPickerActivity.java

diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index 0282eac..9702a3a 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -554,8 +554,10 @@
 
     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();