summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-06-13 20:41:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-13 20:41:13 +0000
commit4f993f0eab972bca47f9e28e665e44227abf187b (patch)
treeaf9e72a6c55006becd52175fc1e42635351541f2 /src/com/android/gallery3d
parent4c122cbf4edd0e0132aa72c18cdbd39b3a03d86e (diff)
parent0a735860321394741cf42a75fcb265b47bc473ba (diff)
downloadandroid_packages_apps_Snap-4f993f0eab972bca47f9e28e665e44227abf187b.tar.gz
android_packages_apps_Snap-4f993f0eab972bca47f9e28e665e44227abf187b.tar.bz2
android_packages_apps_Snap-4f993f0eab972bca47f9e28e665e44227abf187b.zip
Merge "fix start up crash" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index fbe09b999..2d745968b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -37,6 +37,7 @@ import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction;
import android.util.DisplayMetrics;
import android.util.TypedValue;
+import android.util.Log;
import android.view.Display;
import android.view.Menu;
import android.view.MenuItem;
@@ -511,6 +512,10 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
cannotLoadImage();
}
+ if (null == CachingPipeline.getRenderScriptContext()){
+ Log.v(LOGTAG,"RenderScript context destroyed during load");
+ return;
+ }
final View loading = findViewById(R.id.loading);
loading.setVisibility(View.GONE);
final View imageShow = findViewById(R.id.imageShow);
@@ -978,6 +983,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
public void done() {
hideSavingProgress();
+ if (mLoadBitmapTask != null) {
+ mLoadBitmapTask.cancel(false);
+ }
finish();
}