feat(android): restore state when useCamera2api is enabled (react-nat…

…ive-camera#2603)
creativehothouse · Dec 2, 2019 · 1f8b863 · 1f8b863
1 parent fe84811
commit 1f8b863
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/android/src/main/java/com/google/android/cameraview/Camera2.java b/android/src/main/java/com/google/android/cameraview/Camera2.java
@@ -436,7 +436,7 @@ void setPictureSize(Size size) {
             mStillImageReader.close();
         }
         if (size == null) {
-          if (mAspectRatio == null) {
+          if (mAspectRatio == null || mPictureSize == null) {
             return;
           }
           mPictureSizes.sizes(mAspectRatio).last();

diff --git a/android/src/main/java/com/google/android/cameraview/CameraView.java b/android/src/main/java/com/google/android/cameraview/CameraView.java
@@ -293,6 +293,8 @@ public void setUsingCamera2Api(boolean useCamera2) {
             } else {
                 mImpl = new Camera2Api23(mCallbacks, mImpl.mPreview, mContext, mBgHandler);
             }
+
+            onRestoreInstanceState(state);
         } else {
             if (mImpl instanceof Camera1) {
                 return;
@@ -316,7 +318,7 @@ public void start() {
                 this.removeView(mImpl.getView());
             }
             //store the state and restore this state after fall back to Camera1
-            Parcelable state=onSaveInstanceState();
+            Parcelable state = onSaveInstanceState();
             // Camera2 uses legacy hardware layer; fall back to Camera1
             mImpl = new Camera1(mCallbacks, createPreviewImpl(getContext()), mBgHandler);
             onRestoreInstanceState(state);