diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-10-04 12:35:27 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2013-10-04 12:35:27 -0700 |
| commit | 2fe1530ce9ab8c8a48aed7df62c771e774df23a7 (patch) | |
| tree | 30718451701c90294b696f521384708e8113806a /src | |
| parent | d8fe6de10d5ffc293f771b070bd1361a027757bb (diff) | |
| download | android_packages_apps_Trebuchet-2fe1530ce9ab8c8a48aed7df62c771e774df23a7.tar.gz android_packages_apps_Trebuchet-2fe1530ce9ab8c8a48aed7df62c771e774df23a7.tar.bz2 android_packages_apps_Trebuchet-2fe1530ce9ab8c8a48aed7df62c771e774df23a7.zip | |
Fix NPE
Bug: 11069853
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 0282eacd4..9702a3a67 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -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(); |