diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-30 16:22:40 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-30 16:22:40 -0800 |
commit | 507e33ea0bdd483bc520aba7ce8e70f5cc09bd8d (patch) | |
tree | 46122ce2dda02bbc4e82b65b91647264bf52ed74 /src | |
parent | 529d308347a9be851e46be0afa13f8d26464fc83 (diff) | |
parent | 27315e9458ab47c338b4008cb012aa3d6472ad04 (diff) | |
download | android_packages_apps_Snap-507e33ea0bdd483bc520aba7ce8e70f5cc09bd8d.tar.gz android_packages_apps_Snap-507e33ea0bdd483bc520aba7ce8e70f5cc09bd8d.tar.bz2 android_packages_apps_Snap-507e33ea0bdd483bc520aba7ce8e70f5cc09bd8d.zip |
Merge "SnapdragonCamera: enable histogram for front camera" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index b06bd2d12..ab0854eea 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -556,17 +556,16 @@ public class CaptureModule implements CameraModule, PhotoController, updateFocusStateChange(result); Face[] faces = result.get(CaptureResult.STATISTICS_FACES); updateFaceView(faces); - - if (SettingsManager.getInstance().isHistogramSupport()) { - int[] histogramStats = result.get(CaptureModule.histogramStats); - if (histogramStats != null && mHiston) { + } + if (SettingsManager.getInstance().isHistogramSupport()) { + int[] histogramStats = result.get(CaptureModule.histogramStats); + if (histogramStats != null && mHiston) { /*The first element in the array stores max hist value . Stats data begin from second value*/ - synchronized (statsdata) { - System.arraycopy(histogramStats, 0, statsdata, 0, 1024); - } - updateGraghView(); + synchronized (statsdata) { + System.arraycopy(histogramStats, 0, statsdata, 0, 1024); } + updateGraghView(); } } processCaptureResult(result); @@ -3868,7 +3867,7 @@ public class CaptureModule implements CameraModule, PhotoController, private void applyHistogram(CaptureRequest.Builder request) { String value = mSettingsManager.getValue(SettingsManager.KEY_HISTOGRAM); - if (value != null && isBackCamera()) { + if (value != null ) { if (value.equals("enable")){ final byte enable = 1; request.set(CaptureModule.histMode, enable); |