Merge pull request CameraKit#268 from wonderkiln/release/0.12.2

Release 0.12.2
blesslp · Dec 4, 2017 · 500ac04 · 500ac04
2 parents 77a3441 + 7480e95
commit 500ac04
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/camerakit/build.gradle b/camerakit/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 
-def ver = '0.12.1'
+def ver = '0.12.2'
 
 def isSnapshot(version) {
     return version.contains('-Snapshot') || System.getenv('CIRCLE_TAG') == null || System.getenv('CIRCLE_TAG').length() == 0

diff --git a/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java b/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java
@@ -148,8 +148,15 @@ void setDisplayAndDeviceOrientation(int displayOrientation, int deviceOrientatio
         this.mDisplayOrientation = displayOrientation;
         this.mDeviceOrientation = deviceOrientation;
 
-        if (isCameraOpened()) {
-            mCamera.setDisplayOrientation(calculatePreviewRotation());
+        synchronized (mCameraLock) {
+            if (isCameraOpened()) {
+                try {
+                    mCamera.setDisplayOrientation(calculatePreviewRotation());
+                } catch (RuntimeException e) {
+                    // Camera is released. Ignore. Orientations are still valid in local member fields
+                    // so next time camera starts it will have correct configuration.
+                }
+            }
         }
     }