diff options
| author | John Hoford <hoford@google.com> | 2013-05-21 09:10:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-21 09:10:46 -0700 |
| commit | 90529c8c1634c35f39033397c6196922d797ea67 (patch) | |
| tree | e3a1726d016ccd4d232ef3c32a2d36ad822ad25c /src/com/android/gallery3d | |
| parent | d6f247be465060c28be6018c9dee4b098d589eba (diff) | |
| parent | 9eb37145df8adfb0bd68e9023342f5c7a4d12d31 (diff) | |
| download | android_packages_apps_Snap-90529c8c1634c35f39033397c6196922d797ea67.tar.gz android_packages_apps_Snap-90529c8c1634c35f39033397c6196922d797ea67.tar.bz2 android_packages_apps_Snap-90529c8c1634c35f39033397c6196922d797ea67.zip | |
am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
* commit 'a285bc130ff1175c60085410f317e90f6443c39b':
fix TinyPlanets Filter landscape crash
Diffstat (limited to 'src/com/android/gallery3d')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 4b653780e..27b5fb914 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -443,6 +443,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void showRepresentation(FilterRepresentation representation) { + if (representation == null) { + return; + } useFilterRepresentation(representation); // show representation @@ -832,7 +835,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL loadXML(); loadMainPanel(); - if (!mShowingTinyPlanet) { + // mLoadBitmapTask==null implies you have looked at the intent + if (!mShowingTinyPlanet && (mLoadBitmapTask == null)) { mCategoryFiltersAdapter.removeTinyPlanet(); } final View loading = findViewById(R.id.loading); |