diff options
| author | John Hoford <hoford@google.com> | 2013-05-20 18:24:12 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-05-20 18:34:33 -0700 |
| commit | 9eb37145df8adfb0bd68e9023342f5c7a4d12d31 (patch) | |
| tree | e9f65a4b243f7e224a871a498c8af323851601ba /src/com | |
| parent | d165d93679ba8d10d4c7572eb425845243a6e715 (diff) | |
| download | android_packages_apps_Snap-9eb37145df8adfb0bd68e9023342f5c7a4d12d31.tar.gz android_packages_apps_Snap-9eb37145df8adfb0bd68e9023342f5c7a4d12d31.tar.bz2 android_packages_apps_Snap-9eb37145df8adfb0bd68e9023342f5c7a4d12d31.zip | |
fix TinyPlanets Filter landscape crash
bug:9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
Diffstat (limited to 'src/com')
| -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); |