commit ba341487dd44a9d639501d7a86596cb33833de0a
author Fang Hui <b31070@freescale.com> Thu Aug 01 14:43:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 01 14:43:54 2019 -0700
tree 894f81fcde791f747e50d23cd991e8c562faaae4
parent 6a646b7bbb11c1e6db7db67a5c0f9f675edaef08
parent 1cb4f7ea39e20bc2758197fb568200c57a8e2db3

Merge "Camera application exits if take picture after suspend/resume" am: 450c236e72
am: 1cb4f7ea39

Change-Id: Ifc878898eb77cfe43ad9ab58f167d987ccf0831d

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.