Camera2: correct image size recorded in media provider db

Photos taken in camcorder can't be previewed on PC via MTP mode. The
root cause is that, the actual image file size does not always match
the _size column in media provider database. During the saving process,
EXIF data are rewritten, but the size sent to media provider is not
updated accordingly.

Record bytes written in ExifOutputStream and OrderedDataOutputStream so
that after rewritting, the correct image size could be sent to media
provider.

Change-Id: I74d91e86d712c121eb50daecaf879ab4f5be97fc
CRs-Fixed: 711522

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/camera/exif/ExifInterface.java b/src/com/android/camera/exif/ExifInterface.java
index 340f19e1c..f353f3586 100644
--- a/src/com/android/camera/exif/ExifInterface.java
+++ b/src/com/android/camera/exif/ExifInterface.java
@@ -850,14 +850,14 @@ public class ExifInterface {
      * @throws FileNotFoundException
      * @throws IOException
      */
-    public void writeExif(byte[] jpeg, String exifOutFileName) throws FileNotFoundException,
+    public int writeExif(byte[] jpeg, String exifOutFileName) throws FileNotFoundException,
             IOException {
         if (jpeg == null || exifOutFileName == null) {
             throw new IllegalArgumentException(NULL_ARGUMENT_STRING);
         }
-        OutputStream s = null;
+        ExifOutputStream s = null;
         try {
-            s = getExifWriterStream(exifOutFileName);
+            s = (ExifOutputStream) getExifWriterStream(exifOutFileName);
             s.write(jpeg, 0, jpeg.length);
             s.flush();
         } catch (IOException e) {
@@ -865,6 +865,7 @@ public class ExifInterface {
             throw e;
         }
         s.close();
+        return s.size();
     }
 
     /**