Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of github.com:flutter/packages into camera_premature
  • Loading branch information
bparrishMines committed Jun 4, 2025
commit 4e6616b85fa6f97de79c543b55fb9548b8f9683a
17 changes: 16 additions & 1 deletion packages/camera/camera_android_camerax/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
## 0.6.16+1
## 0.6.18+1

* Fixes premature garbage collection of native objects when app is under memory pressure.

## 0.6.18

* Adds support for the `MediaSettings.enableAudio` setting, which determines whether or not audio is
recorded during video recording.

## 0.6.17+1

* Replaces deprecated `onSurfaceDestroyed` with `onSurfaceCleanup`.

## 0.6.17

* Replaces `BroadcastReceiver` usage with an `OrientationEventListener` to detect changes in device
orientation to fix issue where some devices do not report changes in device configuration if it
is rotated between the same sort of orientation (landscape/portrait).

## 0.6.16

* Fixes incorrect camera preview rotation for landscape-oriented devices.
Expand Down
3 changes: 2 additions & 1 deletion packages/camera/camera_android_camerax/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ android {
lint {
checkAllWarnings true
warningsAsErrors true
disable 'AndroidGradlePluginVersion', 'GradleDependency', 'InvalidPackage', 'NewerVersionAvailable', 'UnsafeOptInUsageError'
disable 'AndroidGradlePluginVersion', 'GradleDependency', 'InvalidPackage', 'NewerVersionAvailable'
baseline = file("lint-baseline.xml")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3643,7 +3643,7 @@ abstract class PigeonApiVideoRecordEventListener(
abstract class PigeonApiPendingRecording(
open val pigeonRegistrar: CameraXLibraryPigeonProxyApiRegistrar
) {
/** Enables audio to be recorded for this recording. */
/** Enables/disables audio to be recorded for this recording. */
abstract fun withAudioEnabled(
pigeon_instance: androidx.camera.video.PendingRecording,
initialMuted: Boolean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,9 @@ class PigeonInstanceManager {

final int identifier = _nextUniqueIdentifier();
_identifiers[instance] = identifier;
_weakInstances[identifier] =
WeakReference<PigeonInternalProxyApiBaseClass>(instance);
_weakInstances[identifier] = WeakReference<PigeonInternalProxyApiBaseClass>(
instance,
);
_finalizer.attach(instance, identifier, detach: instance);

final PigeonInternalProxyApiBaseClass copy = instance.pigeon_copy();
Expand Down Expand Up @@ -410,7 +411,9 @@ class PigeonInstanceManager {
/// Throws assertion error if the instance or its identifier has already been
/// added.
void addHostCreatedInstance(
PigeonInternalProxyApiBaseClass instance, int identifier) {
PigeonInternalProxyApiBaseClass instance,
int identifier,
) {
assert(!containsIdentifier(identifier));
assert(getIdentifier(instance) == null);
assert(identifier >= 0);
Expand Down Expand Up @@ -4356,7 +4359,7 @@ class PendingRecording extends PigeonInternalProxyApiBaseClass {
}
}

/// Enables audio to be recorded for this recording.
/// Enables/disables audio to be recorded for this recording.
Future<PendingRecording> withAudioEnabled(bool initialMuted) async {
final _PigeonInternalProxyApiBaseCodec pigeonChannelCodec =
_pigeonVar_codecPendingRecording;
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_android_camerax
description: Android implementation of the camera plugin using the CameraX library.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.6.16+1
version: 0.6.18+1

environment:
sdk: ^3.7.0
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.