1 files changed, 2 insertions, 4 deletions
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
index ebd032199..01f7f6087 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -175,6 +175,7 @@ public class CameraComposerFragment extends CallComposerFragment
     } else if (view == swapCamera) {
       ((Animatable) swapCamera.getDrawable()).start();
       CameraManager.get().swapCamera();
+      cameraDirection = CameraManager.get().getCameraInfo().facing;
     } else if (view == cancel) {
       clearComposer();
     } else if (view == exitFullscreen) {
@@ -366,10 +367,7 @@ public class CameraComposerFragment extends CallComposerFragment
   @Override
   public void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
-
-    CameraInfo cameraInfo = CameraManager.get().getCameraInfo();
-    int facing = cameraInfo == null ? CameraInfo.CAMERA_FACING_BACK : cameraInfo.facing;
-    outState.putInt(CAMERA_DIRECTION_KEY, facing);
+    outState.putInt(CAMERA_DIRECTION_KEY, cameraDirection);
     outState.putParcelable(CAMERA_URI_KEY, cameraUri);
   }