Merge 554182a31ec4aff133c82119f7bcaccb130b2baf on remote branch

Change-Id: Icda0aacfe952268ac3c3c75fdeee3c441b95dc05

4 files changed, 13 insertions, 8 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 93b6c6acf..d8a5b75b5 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2981,7 +2981,7 @@ public class CaptureModule implements CameraModule, PhotoController,
         }
     }
 
-    private boolean isMFNREnabled() {
+    public boolean isMFNREnabled() {
         boolean mfnrEnable = false;
         if (mSettingsManager != null) {
             String mfnrValue = mSettingsManager.getValue(SettingsManager.KEY_CAPTURE_MFNR_VALUE);
@@ -5047,17 +5047,16 @@ public class CaptureModule implements CameraModule, PhotoController,
         applyVideoFlash(mVideoPausePreviewRequestBuilder);
         CaptureRequest captureRequest = null;
         try {
-            if (mMediaRecorderPausing) {
-                captureRequest = mVideoPausePreviewRequestBuilder.build();
-            } else {
-                captureRequest = mVideoRequestBuilder.build();
-            }
+            captureRequest = mVideoRequestBuilder.build();
             if (mCurrentSession instanceof CameraConstrainedHighSpeedCaptureSession) {
                 CameraConstrainedHighSpeedCaptureSession session =
                         (CameraConstrainedHighSpeedCaptureSession) mCurrentSession;
                 List requestList = session.createHighSpeedRequestList(captureRequest);
                 session.setRepeatingBurst(requestList, mCaptureCallback, mCameraHandler);
             } else {
+                if (mMediaRecorderPausing) {
+                    captureRequest = mVideoPausePreviewRequestBuilder.build();
+                }
                 mCurrentSession.setRepeatingRequest(captureRequest, mCaptureCallback,
                         mCameraHandler);
             }
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index dcfd74b6e..fc6ebe3ac 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -689,6 +689,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
                 mSurfaceViewMono.setVisibility(View.GONE);
             }
         }
+        if(mModule.isMFNREnabled() && mModule.getMainCameraId() ==  android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT){
+            mFilterModeSwitcher.setVisibility(View.INVISIBLE);
+        }
     }
 
     public void initializeProMode(boolean promode) {
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index 8d7d4887a..dc7ddd6ae 100755
--- a/src/com/android/camera/SettingsActivity.java
+++ b/src/com/android/camera/SettingsActivity.java
@@ -128,7 +128,10 @@ public class SettingsActivity extends PreferenceActivity {
             Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap();
             for( SettingsManager.SettingState state : settings) {
                 SettingsManager.Values values = map.get(state.key);
-                boolean enabled = values.overriddenValue == null;
+                boolean enabled = false;
+                if (values != null) {
+                    enabled = values.overriddenValue == null;
+                }
                 Preference pref = findPreference(state.key);
                 if ( pref == null ) return;
 
diff --git a/version.mk b/version.mk
index 7ec39db9f..72d4ffb46 100755
--- a/version.mk
+++ b/version.mk
@@ -40,7 +40,7 @@
 # base_version_build is 3 digits and auto-increment for fixing CR.
 base_version_major := 2
 base_version_minor := 02
-base_version_build := 036
+base_version_build := 037
 
 #####################################################
 #####################################################