summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
diff options
context:
space:
mode:
authorDimitar Borisov <dboris@codeaurora.org>2014-09-24 17:32:06 +0300
committerDimitar Borisov <dboris@codeaurora.org>2014-09-30 19:32:14 +0300
commit19656479581c4cdda53e6af6acfcb3346b97164a (patch)
tree68fbc150991ca34e6ab77ced2e603c4c0e925fb3 /src/com/android/camera/VideoUI.java
parent81b91551dfd0f35380094e3434e5358e8d63f0ba (diff)
downloadandroid_packages_apps_Snap-19656479581c4cdda53e6af6acfcb3346b97164a.tar.gz
android_packages_apps_Snap-19656479581c4cdda53e6af6acfcb3346b97164a.tar.bz2
android_packages_apps_Snap-19656479581c4cdda53e6af6acfcb3346b97164a.zip
SnapdragonCamera: Add support for CDS and TNR settings
Add support for CDS and TNR settings - CDS and TNR can be controlled in photo mode and video mode. - CDS is set to off and cannot be set to other value when TNR is enabled - CDS value is restored when TNR is disabled again CRs-Fixed: 715042 Change-Id: Idf08403e38d0e3e634b047a955f2328b4237e691
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
-rw-r--r--src/com/android/camera/VideoUI.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 328645a30..8de713adf 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -438,7 +438,9 @@ public class VideoUI implements PieRenderer.PieListener,
}
public void overrideSettings(final String... keyvalues) {
- mVideoMenu.overrideSettings(keyvalues);
+ if (mVideoMenu != null) {
+ mVideoMenu.overrideSettings(keyvalues);
+ }
}
public void setOrientationIndicator(int orientation, boolean animation) {