am 870e62ac: Handle the case where the orientation column is not here...

* commit '870e62ac801064f83bffc9095cbaee5fe46bdd80':
  Handle the case where the orientation column is not here...

diff --cc src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index c5b35e5,afef58a..af21fda
--- 1/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
--- 2/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@@ -145,26 -135,24 +145,28 @@@ public class ImageLoader 
                          MediaStore.Images.ImageColumns.ORIENTATION
                      },
                      null, null, null);
 -            if (cursor.moveToNext()){
 -              int ori =   cursor.getInt(0);
 -
 -              switch (ori){
 -                  case 0:   return ORI_NORMAL;
 -                  case 90:  return ORI_ROTATE_90;
 -                  case 270: return ORI_ROTATE_270;
 -                  case 180: return ORI_ROTATE_180;
 -                  default:
 -                      return -1;
 -              }
 -            } else{
 +            if (cursor.moveToNext()) {
 +                int ori = cursor.getInt(0);
 +
 +                switch (ori) {
 +                    case 0:
 +                        return ORI_NORMAL;
 +                    case 90:
 +                        return ORI_ROTATE_90;
 +                    case 270:
 +                        return ORI_ROTATE_270;
 +                    case 180:
 +                        return ORI_ROTATE_180;
 +                    default:
 +                        return -1;
 +                }
 +            } else {
                  return -1;
              }
 -        } catch (SQLiteException e){
 +        } catch (SQLiteException e) {
              return ExifInterface.ORIENTATION_UNDEFINED;
+         } catch (IllegalArgumentException e) {
+             return ExifInterface.ORIENTATION_UNDEFINED;
          } finally {
              Utils.closeSilently(cursor);
          }