From 4a47aa1b2e601913a4ec97838ec64c445fec4872 Mon Sep 17 00:00:00 2001 From: jinwu Date: Thu, 28 Nov 2019 15:54:16 +0800 Subject: Fix issue of updating Flash in HFR It doesn't allow to change requests batch in high speed session, so when update flash mode in HFR, it should still send preview and video requests together. Change-Id: Id4092acca15e2bf465f1ebd632f2fa4799567594 --- src/com/android/camera/CaptureModule.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..6d85ca3c9 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5042,17 +5042,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); } -- cgit v1.2.3 From d588e497f536471d0957ebea350f3c3228ff386f Mon Sep 17 00:00:00 2001 From: xianming wang Date: Wed, 27 Nov 2019 16:51:28 +0800 Subject: SnapdragonCamera: Fix NP on monkey case Fix NP on monkey case. Change-Id: Ia7e7a5bc5edab31adaf5e35668d12e77a4890257 --- src/com/android/camera/SettingsActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 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; -- cgit v1.2.3 From 078d6224f3b514846fc94ddbf6c3d29779f58f4e Mon Sep 17 00:00:00 2001 From: jiaoyuan Date: Mon, 2 Dec 2019 16:01:30 +0800 Subject: SnapdraongCamera: disable color filter when enable mfnr Color filter menu shoud be disabled when enable MFNR in front camera Change-Id: I41689623f5221a14938deb5e65f55e91ae41bdc2 --- src/com/android/camera/CaptureModule.java | 2 +- src/com/android/camera/CaptureUI.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 93b6c6acf..c8e644bd5 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); 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) { -- cgit v1.2.3 From c8682df75dd458e48ad020b766c73695c064c536 Mon Sep 17 00:00:00 2001 From: jinwu Date: Mon, 23 Dec 2019 14:12:32 +0800 Subject: Update version number to 2.02.037 Change-Id: Iffbbb899a4a57433c26f23664042f96c152f7c4e --- version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ##################################################### ##################################################### -- cgit v1.2.3