commit 450c236e72b6b26c30a4876845bb6244541a8f50
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 01 20:47:49 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 01 20:47:49 2019 +0000
tree 894f81fcde791f747e50d23cd991e8c562faaae4
parent 7a1ea4e25adc67cfe1826cc3cf0958f7cc6fb300
parent 37afe5ffbcc3a100a5e7cdc8f7ef86b0a2584e30

Merge "Camera application exits if take picture after suspend/resume"

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index b50ab18..322ab0d 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1583,6 +1583,8 @@
         }
         // Dismiss open menu if exists.
         PopupManager.getInstance(this).notifyShowPopup(null);
+
+        if (mCameraSound == null) mCameraSound = new MediaActionSound();
     }
 
     @Override
@@ -1591,7 +1593,10 @@
         stopPreview();
         // Close the camera now because other activities may need to use it.
         closeCamera();
-        if (mCameraSound != null) mCameraSound.release();
+        if (mCameraSound != null) {
+            mCameraSound.release();
+            mCameraSound = null;
+        }
         resetScreenOn();
 
         // Clear UI.