SnapdragonCamera: Camera2 force close when turn on/off beauty

Session was closed, but new session didn't create

Change-Id: I09a03eef6386d4ebd7a988454503024af7ce1961
CRs-Fixed: 1066519

1 files changed, 6 insertions, 7 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index a21808612..e6911ad6c 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3745,19 +3745,18 @@ public class CaptureModule implements CameraModule, PhotoController,
     }
 
     public void restartSession(boolean isSurfaceChanged) {
+        closeProcessors();
+        closeSessions();
+
         if(isSurfaceChanged) {
             mUI.hideSurfaceView();
+            mUI.showSurfaceView();
         }
-        closeProcessors();
-        closeSessions();
+
         initializeValues();
         updatePreviewSize();
         openProcessors();
-        if(isSurfaceChanged) {
-            mUI.showSurfaceView();
-        } else {
-            createSessions();
-        }
+        createSessions();
 
         if(isTrackingFocusSettingOn()) {
             mUI.resetTrackingFocus();