diff options
| author | zhuw <zhuw@codeaurora.org> | 2018-01-30 13:49:15 +0800 |
|---|---|---|
| committer | LuK1337 <priv.luk@gmail.com> | 2019-10-21 21:40:56 +0200 |
| commit | a674df5097ada2c408a03c7c0bd44d032cb72ca6 (patch) | |
| tree | 0ec066f6951c2c4d8271c7593cfcee43c09c1c80 | |
| parent | 1ddbcb1bd460313dc17760c847212c0672fe8365 (diff) | |
| download | android_packages_apps_Gallery2-a674df5097ada2c408a03c7c0bd44d032cb72ca6.tar.gz android_packages_apps_Gallery2-a674df5097ada2c408a03c7c0bd44d032cb72ca6.tar.bz2 android_packages_apps_Gallery2-a674df5097ada2c408a03c7c0bd44d032cb72ca6.zip | |
SDGallery:Fix monkey FC when url from pick activity is null
if url in data of activityResult is null, don't load image
Change-Id: I103d1d431075483ef7cdce1a2bbd6459da69afdc
| -rwxr-xr-x | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 5c289ce02..7fad95601 100755 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -2549,7 +2549,9 @@ DialogInterface.OnDismissListener, PopupMenu.OnDismissListener{ if (resultCode == RESULT_OK) { if (requestCode == SELECT_PICTURE) { Uri selectedImageUri = data.getData(); - startLoadBitmap(selectedImageUri); + if (selectedImageUri != null) { + startLoadBitmap(selectedImageUri); + } } else if (requestCode == SELECT_FUSION_UNDERLAY) { Uri underlayImageUri = data.getData(); // find fusion representation |