diff options
| author | likaid <likaid@codeaurora.org> | 2015-03-02 16:02:01 +0800 |
|---|---|---|
| committer | likaid <likaid@codeaurora.org> | 2015-03-11 09:48:38 +0800 |
| commit | 3689f9ecffe9fa18c91d4a6d479b2329efe3752e (patch) | |
| tree | f69a51d176b0d62f0fc287ce8d48d63a5c348833 /src/com/android/camera/VideoModule.java | |
| parent | 2d894ed368689085e89b6f0b79fb355575267e97 (diff) | |
| download | android_packages_apps_Snap-3689f9ecffe9fa18c91d4a6d479b2329efe3752e.tar.gz android_packages_apps_Snap-3689f9ecffe9fa18c91d4a6d479b2329efe3752e.tar.bz2 android_packages_apps_Snap-3689f9ecffe9fa18c91d4a6d479b2329efe3752e.zip | |
SnapdragonCamera: Fix app FC when time lapse and HFR is set to ON
After HFR and time lapse both are on, the ListMenu is initialize again
and mListMenu is set null which lead to NullPointerException happened.
Don't initialize listmenu when it's showing, move toast to VideoMenu
reference similar code in PhotoModule.
Change-Id: I9eaa308cc1b5eccb7bc86a3da6ae99f09b280be9
CRs-Fixed: 796135
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 6e3198390..51487ca52 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2261,12 +2261,9 @@ public class VideoModule implements CameraModule, (disMode.equals("enable")) || ((hdr != null) && (!hdr.equals("off"))) ) { Log.v(TAG,"HDR/DIS/Time Lapse ON for HFR/HSR selection, turning HFR/HSR off"); - RotateTextToast.makeText(mActivity, R.string.error_app_unsupported_hfr_selection, - Toast.LENGTH_LONG).show(); mParameters.setVideoHighFrameRate("off"); mParameters.set(CameraSettings.KEY_VIDEO_HSR, "off"); mUI.overrideSettings(CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, "off"); - mUI.initializePopup(mPreferenceGroup); } } |