From cfa709835ab85702ee8a9ed24bbe7a3fe736c3f5 Mon Sep 17 00:00:00 2001 From: Anniek Date: Thu, 31 Dec 2020 13:27:56 +0100 Subject: [PATCH] Added closeCaptureSession() to stopVideoRecording in Camera.java to fix an Android 6 crash (#3336) Co-authored-by: Maurits van Beusekom --- packages/camera/camera/CHANGELOG.md | 4 ++++ .../src/main/java/io/flutter/plugins/camera/Camera.java | 1 + packages/camera/camera/pubspec.yaml | 2 +- .../example/android/gradle/wrapper/gradle-wrapper.properties | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 packages/camera/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md index f576ee524ca1..3bb1b0639c97 100644 --- a/packages/camera/camera/CHANGELOG.md +++ b/packages/camera/camera/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.4+1 + +* Added closeCaptureSession() to stopVideoRecording in Camera.java to fix an Android 6 crash + ## 0.6.4 * Adds auto exposure support for Android and iOS implementations. diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java index d57a737c09f6..a3ae3f275213 100644 --- a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java +++ b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java @@ -560,6 +560,7 @@ public void stopVideoRecording(@NonNull final Result result) { try { recordingVideo = false; + closeCaptureSession(); mediaRecorder.stop(); mediaRecorder.reset(); startPreview(); diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml index 0811ac442852..2b392f17bf82 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.6.4 +version: 0.6.4+1 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera dependencies: diff --git a/packages/camera/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/camera/example/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000000..be52383ef49c --- /dev/null +++ b/packages/camera/example/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists