patch for camera crash in MiniCM7-2.2.1-robyn

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Active sport or night mode, simply said anything other than default
2. kill camera app
3. start camera again, try to do a photo

What is the expected output? What do you see instead?
Camera crashes when triggering a photo if it is in "sport mode" from the start.

What version of MiniCM you are using? On what device (X10mini, X10minipro,
X8)? Are you using Compcache/Zram? Are you overclocking/undervolting?
x10mini MiniCM7-2.2.1-robyn

Please provide any additional information below.

that's due to incorrect initialization of mShutterSound. Certainly mCaptureMode 
causes crash somewhere else and should be probably fixed as well, however I did 
not detect such crash.

diff --git a/src/com/android/camera/Camera.java 
b/src/com/android/camera/Camera.java
index 4683d9d..36a7596 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -2171,11 +2171,6 @@ public class Camera extends BaseCamera implements 
View.OnClickListener,
                     CameraSettings.KEY_FOCUS_MODE,
                     getString(R.string.pref_camera_focusmode_default));

-            // Set shutter sound.
-            mShutterSound = mPreferences.getString(
-                    CameraSettings.KEY_SHUTTER_SOUND,
-                    
getString(R.string.pref_camera_shuttersound_entry_default));
-
             // Set capture mode.
             mCaptureMode = mPreferences.getString(
                     CameraSettings.KEY_CAPTURE_MODE,
@@ -2199,6 +2194,11 @@ public class Camera extends BaseCamera implements 
View.OnClickListener,
         } else {
             mFocusMode = mParameters.getFocusMode();
         }
+        // Set shutter sound.
+        mShutterSound = mPreferences.getString(
+           CameraSettings.KEY_SHUTTER_SOUND,
+           getString(R.string.pref_camera_shuttersound_entry_default));
+
     }

     // We separate the parameters into several subsets, so we can update only

Original issue reported on code.google.com by marian.g...@gmail.com on 12 Sep 2014 at 9:00