Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1

Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5

1 files changed, 15 insertions, 5 deletions

diff --git a/src/com/android/camera/MediaSaveService.java b/src/com/android/camera/MediaSaveService.java
index 7c1b050f2..72606766d 100755..100644
--- a/src/com/android/camera/MediaSaveService.java
+++ b/src/com/android/camera/MediaSaveService.java
@@ -291,8 +291,14 @@ public class MediaSaveService extends Service {
 
             // combine to single mpo
             String path = Storage.generateFilepath(title, pictureFormat);
-            MpoInterface.writeMpo(mpo, path);
-            return Storage.addImage(MediaSaveService.this, path);
+            int size = MpoInterface.writeMpo(mpo, path);
+            // Try to get the real image size after add exif.
+            File f = new File(path);
+            if (f.exists() && f.isFile()) {
+                size = (int) f.length();
+            }
+            return Storage.addImage(resolver, title, date, loc, orientation, null,
+                    size, path, width, height, pictureFormat);
         }
 
         @Override
@@ -378,7 +384,9 @@ public class MediaSaveService extends Service {
 
         @Override
         protected Uri doInBackground(Void... params) {
-            return Storage.addImage(MediaSaveService.this, path);
+            return Storage.addHeifImage(
+                    resolver,title,date,loc,orientation,exif,path,
+                    width,height,quality,pictureFormat);
         }
 
         @Override
@@ -430,7 +438,8 @@ public class MediaSaveService extends Service {
                 width = options.outWidth;
                 height = options.outHeight;
             }
-            return Storage.addImage(MediaSaveService.this, title, exif, data, pictureFormat);
+            return Storage.addImage(
+                    resolver, title, date, loc, orientation, exif, data, width, height, pictureFormat);
         }
 
         @Override
@@ -506,7 +515,8 @@ public class MediaSaveService extends Service {
                 width = options.outWidth;
                 height = options.outHeight;
             }
-            return Storage.addImage(MediaSaveService.this, title, exif, data, pictureFormat);
+            return Storage.addImage(
+                    resolver, title, date, loc, orientation, exif, data, width, height, pictureFormat);
         }
 
         @Override