Merge remote-tracking branch 'origin/master' into plugin_platform_interface_stable

Author: kevmoo

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.0-nullsafety.1
+
+* Added a timeout to the pre-capture sequence on Android to prevent crashes when the camera cannot get a focus.
+
 ## 0.8.0-nullsafety
 
 * Migrated to null safety.

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -36,6 +36,7 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.util.Log;
 import android.util.Range;
 import android.util.Rational;
@@ -73,6 +74,9 @@ interface ErrorCallback {
 public class Camera {
   private static final String TAG = "Camera";
 
+  /** Timeout for the pre-capture sequence. */
+  private static final long PRECAPTURE_TIMEOUT_MS = 1000;
+
   private final SurfaceTextureEntry flutterTexture;
   private final CameraManager cameraManager;
   private final DeviceOrientationManager deviceOrientationListener;
@@ -105,6 +109,7 @@ public class Camera {
   private boolean useAutoFocus = true;
   private Range<Integer> fpsRange;
   private PlatformChannel.DeviceOrientation lockedCaptureOrientation;
+  private long preCaptureStartTime;
 
   private static final HashMap<String, Integer> supportedImageFormats;
   // Current supported outputs
@@ -503,11 +508,16 @@ private void processCapture(CaptureResult result) {
                   || aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED
                   || aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED) {
                 pictureCaptureRequest.setState(State.waitingPreCaptureReady);
+                setPreCaptureStartTime();
               }
               break;
             case waitingPreCaptureReady:
               if (aeState == null || aeState != CaptureRequest.CONTROL_AE_STATE_PRECAPTURE) {
                 runPictureCapture();
+              } else {
+                if (hitPreCaptureTimeout()) {
+                  unlockAutoFocus();
+                }
               }
           }
         }
@@ -1142,6 +1152,20 @@ public void stopImageStream() throws CameraAccessException {
     startPreview();
   }
 
+  /** Sets the time the pre-capture sequence started. */
+  private void setPreCaptureStartTime() {
+    preCaptureStartTime = SystemClock.elapsedRealtime();
+  }
+
+  /**
+   * Check if the timeout for the pre-capture sequence has been reached.
+   *
+   * @return true if the timeout is reached; otherwise false is returned.
+   */
+  private boolean hitPreCaptureTimeout() {
+    return (SystemClock.elapsedRealtime() - preCaptureStartTime) > PRECAPTURE_TIMEOUT_MS;
+  }
+
   private void closeCaptureSession() {
     if (cameraCaptureSession != null) {
       cameraCaptureSession.close();

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.8.0-nullsafety
+version: 0.8.0-nullsafety.1
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 
 dependencies:

packages/camera/camera/test/camera_test.dart

@@ -1268,7 +1268,7 @@ class MockCameraPlatform extends Mock
   Future<int> createCamera(
     CameraDescription description,
     ResolutionPreset? resolutionPreset, {
-    bool enableAudio = true,
+    bool enableAudio = false,
   }) =>
       mockPlatformException
           ? throw PlatformException(code: 'foo', message: 'bar')

packages/video_player/video_player/README.md

@@ -77,7 +77,7 @@ class _VideoAppState extends State<VideoApp> {
   void initState() {
     super.initState();
     _controller = VideoPlayerController.network(
-        'http://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_20mb.mp4')
+        'https://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_20mb.mp4')
       ..initialize().then((_) {
         // Ensure the first frame is shown after the video is initialized, even before the play button has been pressed.
         setState(() {});

script/tool/lib/src/publish_check_command.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:io' as io;
 
 import 'package:colorize/colorize.dart';
 import 'package:file/file.dart';
@@ -63,6 +64,44 @@ class PublishCheckCommand extends PluginCommand {
     }
   }
 
+  Future<bool> hasValidPublishCheckRun(Directory package) async {
+    final io.Process process = await io.Process.start(
+      'flutter',
+      <String>['pub', 'publish', '--', '--dry-run'],
+      workingDirectory: package.path,
+    );
+
+    final StringBuffer outputBuffer = StringBuffer();
+
+    final Completer<void> stdOutCompleter = Completer<void>();
+    process.stdout.listen(
+      (List<int> event) {
+        io.stdout.add(event);
+        outputBuffer.write(String.fromCharCodes(event));
+      },
+      onDone: () => stdOutCompleter.complete(),
+    );
+
+    final Completer<void> stdInCompleter = Completer<void>();
+    process.stderr.listen(
+      (List<int> event) {
+        io.stderr.add(event);
+        outputBuffer.write(String.fromCharCodes(event));
+      },
+      onDone: () => stdInCompleter.complete(),
+    );
+
+    if (await process.exitCode == 0) return true;
+
+    await stdOutCompleter.future;
+    await stdInCompleter.future;
+
+    final String output = outputBuffer.toString();
+    return output.contains('Package has 1 warning.') &&
+        output.contains(
+            'Packages with an SDK constraint on a pre-release of the Dart SDK should themselves be published as a pre-release version.');
+  }
+
   Future<bool> passesPublishCheck(Directory package) async {
     final String packageName = package.basename;
     print('Checking that $packageName can be published.');
@@ -75,13 +114,7 @@ class PublishCheckCommand extends PluginCommand {
       return true;
     }
 
-    final int exitCode = await processRunner.runAndStream(
-      'flutter',
-      <String>['pub', 'publish', '--', '--dry-run'],
-      workingDir: package,
-    );
-
-    if (exitCode == 0) {
+    if (await hasValidPublishCheckRun(package)) {
       print("Package $packageName is able to be published.");
       return true;
     } else {