From: ztenghui <ztenghui@google.com>
Date: Mon, 22 Jul 2013 21:06:22 +0000 (-0700)
Subject: WAR the crash from re-editing missing online image
X-Git-Tag: android-x86-7.1-r1~478^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a08fab5958ecd50ada4b7c013af362029c61f117;p=android-x86%2Fpackages-apps-Gallery2.git

WAR the crash from re-editing missing online image

Instead of crashing, we get a toast now.
As a bonus, this will show the same toast if .aux directory is removed
manually.

bug:9961671
Change-Id: I92f38fc752a48d3cb5a9a80aa041cd9b290937ea
---

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 9508bdc21..d589bef0b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -160,6 +160,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {
+        @Override
         public void onServiceConnected(ComponentName className, IBinder service) {
             /*
              * This is called when the connection with the service has been
@@ -173,6 +174,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
             mBoundService.onStart();
         }
 
+        @Override
         public void onServiceDisconnected(ComponentName className) {
             /*
              * This is called when the connection with the service has been
@@ -598,6 +600,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
 
             if (!result) {
                 cannotLoadImage();
+                // TODO: We should figure out the best way preventing this from
+                // happening, e.g: early checking.
+                return;
             }
 
             if (null == CachingPipeline.getRenderScriptContext()){
@@ -669,7 +674,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     private int getScreenImageSize() {
         DisplayMetrics outMetrics = new DisplayMetrics();
         getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
-        return (int) Math.max(outMetrics.heightPixels, outMetrics.widthPixels);
+        return Math.max(outMetrics.heightPixels, outMetrics.widthPixels);
     }
 
     private void showSavingProgress(String albumName) {