From 23aa4629b5742c9b077fdefdae07b5b50e68a1f8 Mon Sep 17 00:00:00 2001 From: Hemanth Raj Date: Thu, 11 Feb 2021 15:09:45 +0530 Subject: [PATCH 1/3] Fixes #75133 --- .../io/flutter/plugins/camera/DeviceOrientationManager.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java index 7c6011b185fb..efd03eae7f5f 100644 --- a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java +++ b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java @@ -55,6 +55,12 @@ public int getMediaOrientation() { public int getMediaOrientation(PlatformChannel.DeviceOrientation orientation) { int angle = 0; + + // Fallback to device orientation when the orientation value is null + if(orientation==null){ + orientation = getUIOrientation(); + } + switch (orientation) { case PORTRAIT_UP: angle = 0; From 55b82acea64ea8933250c41308182a9c5a1f82d4 Mon Sep 17 00:00:00 2001 From: Hemanth Raj Date: Thu, 11 Feb 2021 15:15:31 +0530 Subject: [PATCH 2/3] Updated pubspec.yaml and change log --- packages/camera/camera/CHANGELOG.md | 4 ++++ packages/camera/camera/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md index 622bd095b021..e365e76cbafd 100644 --- a/packages/camera/camera/CHANGELOG.md +++ b/packages/camera/camera/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.0+4 + +* Fix crash when taking picture with orientation lock + ## 0.7.0+3 * Clockwise rotation of focus point in android diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index cebbb334c8f2..5ac4b57a15ef 100644 --- a/packages/camera/camera/pubspec.yaml +++ b/packages/camera/camera/pubspec.yaml @@ -2,7 +2,7 @@ name: camera description: A Flutter plugin for getting information about and controlling the camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video, and streaming image buffers to dart. -version: 0.7.0+3 +version: 0.7.0+4 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera dependencies: From 645a40d75dce4994dec90085c8ec5c08180a181c Mon Sep 17 00:00:00 2001 From: Hemanth Raj Date: Thu, 11 Feb 2021 15:35:36 +0530 Subject: [PATCH 3/3] Fix format --- .../io/flutter/plugins/camera/DeviceOrientationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java index efd03eae7f5f..b2a504b629d6 100644 --- a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java +++ b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java @@ -57,7 +57,7 @@ public int getMediaOrientation(PlatformChannel.DeviceOrientation orientation) { int angle = 0; // Fallback to device orientation when the orientation value is null - if(orientation==null){ + if (orientation == null) { orientation = getUIOrientation(); }