From ec965b6ca57d3422e50bc1a476e0ff046f768ef5 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Tue, 15 Jan 2013 17:23:40 -0800
Subject: Fix exif data saving for picasa images.

Bug: 7910836
Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
---
 gallerycommon/src/com/android/gallery3d/common/Utils.java    | 5 +++--
 gallerycommon/src/com/android/gallery3d/exif/ExifParser.java | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'gallerycommon')

diff --git a/gallerycommon/src/com/android/gallery3d/common/Utils.java b/gallerycommon/src/com/android/gallery3d/common/Utils.java
index 3a68745c4..614a081c8 100644
--- a/gallerycommon/src/com/android/gallery3d/common/Utils.java
+++ b/gallerycommon/src/com/android/gallery3d/common/Utils.java
@@ -26,6 +26,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import java.io.Closeable;
+import java.io.IOException;
 import java.io.InterruptedIOException;
 
 public class Utils {
@@ -173,8 +174,8 @@ public class Utils {
         if (c == null) return;
         try {
             c.close();
-        } catch (Throwable t) {
-            Log.w(TAG, "close fail", t);
+        } catch (IOException t) {
+            Log.w(TAG, "close fail ", t);
         }
     }
 
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
index a1ce13e69..1e4803f68 100644
--- a/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
+++ b/gallerycommon/src/com/android/gallery3d/exif/ExifParser.java
@@ -179,6 +179,9 @@ public class ExifParser {
 
     private ExifParser(InputStream inputStream, int options)
             throws IOException, ExifInvalidFormatException {
+        if (inputStream == null) {
+            throw new IOException("Null argument inputStream to ExifParser");
+        }
         mContainExifData = seekTiffData(inputStream);
         mTiffStream = new CountedDataInputStream(inputStream);
         mOptions = options;
@@ -682,7 +685,6 @@ public class ExifParser {
     private boolean seekTiffData(InputStream inputStream) throws IOException,
             ExifInvalidFormatException {
         CountedDataInputStream dataStream = new CountedDataInputStream(inputStream);
-
         if (dataStream.readShort() != JpegHeader.SOI) {
             throw new ExifInvalidFormatException("Invalid JPEG format");
         }
-- 
cgit v1.2.3