commit 8fdb0a028adf8adb0ba77a04b257e50b625f98a8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 15 23:54:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 15 23:54:23 2020 +0000
tree 7960879ea85cdf31b1f486ae841bb46345a21f32
parent b41edb09aa30bb4ad7a2379204174ab7e2d27ffe
parent 6290d40e02d4dad7098c13e2d2615c6d7d5ba6bf

Merge "AOSP/Camera2 - Remove Saving bar after taking a photo" am: e06fd1d768 am: b63aca0735 am: 6290d40e02

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1356041

Change-Id: I5cdb1d3cc483fb724e484de0198e6b19745ed977

src/com/android/camera/CameraActivity.java

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 9de0037..1a81349 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -3002,21 +3002,7 @@
             showProcessError(sessionManager.getErrorMessageId(contentUri));
         } else {
             filmstripBottomPanel.hideProgressError();
-            CaptureSession session = sessionManager.getSession(contentUri);
-
-            if (session != null) {
-                int sessionProgress = session.getProgress();
-
-                if (sessionProgress < 0) {
-                    hideSessionProgress();
-                } else {
-                    int progressMessageId = session.getProgressMessageId();
-                    showSessionProgress(progressMessageId);
-                    updateSessionProgress(sessionProgress);
-                }
-            } else {
-                hideSessionProgress();
-            }
+            hideSessionProgress();
         }
 
         /* View button */

src/com/android/camera/Storage.java

diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
index 385e465..bc8d1bc 100644
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -188,10 +188,12 @@
         } else {
             bitmap.compress(Bitmap.CompressFormat.JPEG, 90, os);
         }
+        os.close();
 
         ContentValues publishValues = new ContentValues();
         publishValues.put(Media.IS_PENDING, 0);
         resolver.update(uri, publishValues, null, null);
+        Log.i(TAG, "Image with uri: " + uri + " was published to the MediaStore");
     }
 
     // Get a ContentValues object for the given photo data
@@ -206,6 +208,8 @@
 
         if (isPending) {
             values.put(Media.IS_PENDING, 1);
+        } else {
+            values.put(Media.IS_PENDING, 0);
         }
 
         if (location != null) {
@@ -366,6 +370,7 @@
             // Update the MediaStore
             ContentValues values = getContentValuesForData(title, date, location, mimeType, false);
             resolver.update(imageUri, values, null, null);
+            Log.i(TAG, "Image with uri: " + imageUri + " was updated in the MediaStore");
         }
         return resultUri;
     }