diff options
| author | John Hoford <hoford@google.com> | 2013-05-21 09:10:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-21 09:10:59 -0700 |
| commit | c6038e29aea5012a8c342d1a4c72aa26a9895519 (patch) | |
| tree | e463b0b3705ad361a94a1f6e91650bd83d014e4c /src | |
| parent | 1998968a17c490276ffc46c7466401011109063b (diff) | |
| parent | a285bc130ff1175c60085410f317e90f6443c39b (diff) | |
| download | android_packages_apps_Gallery2-c6038e29aea5012a8c342d1a4c72aa26a9895519.tar.gz android_packages_apps_Gallery2-c6038e29aea5012a8c342d1a4c72aa26a9895519.tar.bz2 android_packages_apps_Gallery2-c6038e29aea5012a8c342d1a4c72aa26a9895519.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')
| -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 d13d261a8..e5ddbf5da 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -433,6 +433,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } public void showRepresentation(FilterRepresentation representation) { + if (representation == null) { + return; + } useFilterRepresentation(representation); // show representation @@ -817,7 +820,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); |