commit 9eb37145df8adfb0bd68e9023342f5c7a4d12d31
author John Hoford <hoford@google.com> Mon May 20 18:24:12 2013 -0700
committer John Hoford <hoford@google.com> Mon May 20 18:34:33 2013 -0700
tree e9f65a4b243f7e224a871a498c8af323851601ba
parent d165d93679ba8d10d4c7572eb425845243a6e715

fix TinyPlanets Filter landscape crash

bug:9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05

src/com/android/gallery3d/filtershow/FilterShowActivity.java

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index d13d261..e5ddbf5 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -433,6 +433,9 @@
     }
 
     public void showRepresentation(FilterRepresentation representation) {
+        if (representation == null) {
+            return;
+        }
         useFilterRepresentation(representation);
 
         // show representation
@@ -817,7 +820,8 @@
         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);