diff options
author | qimengp <qimengp@codeaurora.org> | 2016-12-12 17:10:01 +0800 |
---|---|---|
committer | qimengp <qimengp@codeaurora.org> | 2016-12-13 19:35:36 +0800 |
commit | 87d662fe60738338359c8a5e113260e6c01b6ab8 (patch) | |
tree | 71446eea1b96a09b90d13cd210b13f387a88b49c /src/com/android/camera/CaptureUI.java | |
parent | aae159bb14b9d8dda5a40cd18eb4de4020b5b217 (diff) | |
download | android_packages_apps_Snap-87d662fe60738338359c8a5e113260e6c01b6ab8.tar.gz android_packages_apps_Snap-87d662fe60738338359c8a5e113260e6c01b6ab8.tar.bz2 android_packages_apps_Snap-87d662fe60738338359c8a5e113260e6c01b6ab8.zip |
SnapdragonCamera: Fix FC caused by mSession Null
There are lots of FC caused by mCameraDevice/mBuilder/mSession Null,
In the condition:
1. Between opening camera app and not ready to preview.
2. App pause, and then resume to app
3. Restart session by makeup or flash mode change
4. restart all by change camera devices
Checking NULL and add illegal state handler is a work around way.
Change-Id: I26edfbde8944280c51f4a05f91deacb76e24b6f3
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index aed62aaa9..b77d635ff 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -228,7 +228,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, return mDisplaySize; } - public CaptureUI(CameraActivity activity, CaptureModule module, View parent) { + public CaptureUI(CameraActivity activity, final CaptureModule module, View parent) { mActivity = activity; mModule = module; mRootView = parent; @@ -298,8 +298,10 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mMakeupButton.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View v) { - toggleMakeup(); - updateMenus(); + if (module != null && !module.isAllSessionClosed()) { + toggleMakeup(); + updateMenus(); + } } }); setMakeupButtonIcon(); |