fix(upstream): integrate open PRs and issues from flutter-ml/google_ml_kit_flutter

- PR flutter-ml#864 / Issue flutter-ml#863: Fix iOS IOSurface memory leak in pixelBufferToVisionImage.
  Replaces CoreImage CIContext+createCGImage round-trip with VisionImage(buffer:)
  via CMSampleBuffer wrapper, eliminating ~3.5 MiB leak per frame on sustained
  camera streaming.

- PR flutter-ml#862 / Issue flutter-ml#825: Add Apple Silicon iOS 26+ simulator support.
  Ships opt-in Podfile helper (apple_silicon_simulator.rb + patch_arm64_simulator.py)
  that re-labels arm64 device slices as iOS Simulator and strips EXCLUDED_ARCHS.
  Updates README with usage instructions and wires up example app Podfile.

- Issue flutter-ml#857: Fix IllegalStateException 'Reply already submitted' crash in
  DocumentScanner on Oppo/ColorOS devices. Clears pendingResult after calling
  .success() or .error() so duplicate onActivityResult deliveries are safe.

Author: udiedrichsen

packages/example/ios/Podfile

@@ -23,6 +23,7 @@ def flutter_root
 end
 
 require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+require File.expand_path('../../google_mlkit_commons/ios/scripts/apple_silicon_simulator', __dir__)
 
 flutter_ios_podfile_setup
 
@@ -56,4 +57,6 @@ post_install do |installer|
       end
     end
   end
+
+  mlkit_apple_silicon_simulator_patch(installer)
 end

packages/google_mlkit_commons/README.md

@@ -77,6 +77,33 @@ end
 
 Notice that the minimum `IPHONEOS_DEPLOYMENT_TARGET` is 15.5, you can set it to something newer but not older.
 
+#### Apple Silicon iOS Simulator (iOS 26+)
+
+Google's `GoogleMLKit/*` pods only ship `arm64-iphoneos` and `x86_64-iphonesimulator` slices and exclude `arm64` from simulator builds. On Apple Silicon Macs running iOS 26+ simulators (where Rosetta 2 is no longer the default for the iOS Simulator) this makes `flutter run` fail with `Unable to find a destination matching the provided destination specifier`. Issue tracked upstream by Google: https://issuetracker.google.com/issues/178965151.
+
+Until proper `arm64-iphonesimulator` slices are published, this plugin ships an **opt-in** Podfile helper that re-labels the existing arm64 device slice as iOS Simulator (the same `LC_BUILD_VERSION.platform` swap used by the well-known [`arm64-to-sim`](https://github.com/bogo/arm64-to-sim) tool) and strips the `EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64` from the generated xcconfigs.
+
+To enable it, add two lines to your iOS `Podfile`:
+
+```ruby
+# Near the top, after `require ... podhelper ...`:
+require File.expand_path(
+  '.symlinks/plugins/google_mlkit_commons/ios/scripts/apple_silicon_simulator',
+  __dir__,
+)
+
+post_install do |installer|
+  # ...your existing post_install code...
+
+  # Add this line at the end:
+  mlkit_apple_silicon_simulator_patch(installer)
+end
+```
+
+Then re-run `pod install`. The example app under `packages/example` is wired up this way.
+
+The helper only changes vendored binaries inside `Pods/` and the `EXCLUDED_ARCHS` line in pod-generated xcconfigs. Device builds and release builds are unaffected. Remove the two lines to revert.
+
 ### Android
 
 - minSdkVersion: 21

packages/google_mlkit_commons/ios/Classes/MLKVisionImage+FlutterPlugin.swift

@@ -2,6 +2,7 @@ import Flutter
 import MLKitVision
 import UIKit
 import CoreGraphics
+import CoreMedia
 import CoreVideo
 
 // MARK: - VisionImage from Flutter imageData
@@ -111,20 +112,46 @@ extension VisionImage {
     return pxBuffer
   }
 
+  // Wraps a CVPixelBuffer in a CMSampleBuffer and feeds it to MLKit via
+  // VisionImage(buffer:). The previous implementation created a fresh CIContext
+  // per frame and called createCGImage(_:from:); each call inserts a
+  // CI::SurfaceCacheEntry that the system never releases under sustained
+  // camera streaming, leaking ~3.5 MiB of IOSurface memory per call (300+ MiB
+  // per minute on 720p BGRA). VisionImage(buffer:) bypasses CoreImage entirely
+  // and is the same path Google's official MLKit iOS sample uses
+  // (googlesamples/mlkit CameraViewController.swift).
   private static func pixelBufferToVisionImage(_ pixelBufferRef: CVPixelBuffer) -> VisionImage? {
-    let ciImage = CIImage(cvPixelBuffer: pixelBufferRef)
-    let context = CIContext(options: nil)
-    let width = CVPixelBufferGetWidth(pixelBufferRef)
-    let height = CVPixelBufferGetHeight(pixelBufferRef)
-    guard let cgImage = context.createCGImage(
-      ciImage,
-      from: CGRect(x: 0, y: 0, width: width, height: height)
-    ) else {
+    var formatDesc: CMVideoFormatDescription?
+    let formatStatus = CMVideoFormatDescriptionCreateForImageBuffer(
+      allocator: kCFAllocatorDefault,
+      imageBuffer: pixelBufferRef,
+      formatDescriptionOut: &formatDesc
+    )
+    guard formatStatus == noErr, let formatDescription = formatDesc else {
+      return nil
+    }
+
+    var timing = CMSampleTimingInfo(
+      duration: .invalid,
+      presentationTimeStamp: .zero,
+      decodeTimeStamp: .invalid
+    )
+    var sampleBuffer: CMSampleBuffer?
+    let sampleStatus = CMSampleBufferCreateForImageBuffer(
+      allocator: kCFAllocatorDefault,
+      imageBuffer: pixelBufferRef,
+      dataReady: true,
+      makeDataReadyCallback: nil,
+      refcon: nil,
+      formatDescription: formatDescription,
+      sampleTiming: &timing,
+      sampleBufferOut: &sampleBuffer
+    )
+    guard sampleStatus == noErr, let sampleBuffer = sampleBuffer else {
       return nil
     }
-    // Swift ARC manages CGImage; UIImage(cgImage:) retains it.
-    let uiImage = UIImage(cgImage: cgImage)
-    return VisionImage(image: uiImage)
+
+    return VisionImage(buffer: sampleBuffer)
   }
 
   private static func bitmapToVisionImage(_ imageDict: [String: Any]) -> VisionImage? {

packages/google_mlkit_commons/ios/scripts/apple_silicon_simulator.rb

@@ -0,0 +1,29 @@
+# Opt-in Podfile helper that lets Google ML Kit pods build for Apple Silicon
+# iOS 26+ simulators. See packages/google_mlkit_commons/README.md (iOS
+# section) for rationale and usage. Upstream Google bug:
+# https://issuetracker.google.com/issues/178965151
+
+def mlkit_apple_silicon_simulator_patch(installer)
+  pods_dir = File.expand_path(installer.sandbox.root.to_s)
+  patcher  = File.expand_path('patch_arm64_simulator.py', __dir__)
+
+  framework_dirs = Dir.glob(File.join(pods_dir, '{MLKit*,MLImage*}'))
+                      .select { |d| File.directory?(d) }
+  unless framework_dirs.empty?
+    Pod::UI.puts ''
+    Pod::UI.puts "[ml_kit] Patching #{framework_dirs.size} ML Kit " \
+                 'framework(s) for Apple Silicon iOS Simulator...'
+    unless system('python3', patcher, *framework_dirs)
+      Pod::UI.warn '[ml_kit] arm64 simulator patcher failed; ' \
+                   'simulator build may still require Rosetta.'
+    end
+  end
+
+  excluded = 'EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64'
+  Dir.glob(File.join(pods_dir, 'Target Support Files', '**', '*.xcconfig'))
+     .each do |xcconfig|
+    text = File.read(xcconfig)
+    new_text = text.lines.reject { |l| l.strip == excluded }.join
+    File.write(xcconfig, new_text) if text != new_text
+  end
+end

packages/google_mlkit_commons/ios/scripts/patch_arm64_simulator.py

@@ -0,0 +1,170 @@
+#!/usr/bin/env python3
+"""Re-label the arm64 device slice of Google ML Kit static frameworks as
+iOS Simulator. Walks every .o member of the arm64 archive and flips
+LC_BUILD_VERSION.platform from 2 (iOS) to 7 (iOS Simulator); no
+instructions or symbols are touched. Same approach as arm64-to-sim.
+Idempotent. See packages/google_mlkit_commons/README.md (iOS section).
+
+Usage: python3 patch_arm64_simulator.py <Pods/MLKitFoo> [<Pods/MLKitBar> ...]
+"""
+
+import os
+import struct
+import subprocess
+import sys
+import tempfile
+
+FAT_MAGIC      = 0xCAFEBABE
+FAT_MAGIC_64   = 0xCAFEBABF
+MH_MAGIC_64    = 0xFEEDFACF
+LC_BUILD_VERSION = 0x32
+PLATFORM_IOS = 2
+PLATFORM_IOS_SIMULATOR = 7
+CPU_TYPE_ARM64 = 0x0100000c
+
+
+def _patch_macho_object(buf):
+    if len(buf) < 32:
+        return buf, False
+    magic = struct.unpack_from('<I', buf, 0)[0]
+    if magic != MH_MAGIC_64:
+        return buf, False
+    cputype, _cpusub, _filetype, ncmds, _sizeofcmds, _flags, _reserved = \
+        struct.unpack_from('<iIIIIII', buf, 4)
+    if cputype != CPU_TYPE_ARM64:
+        return buf, False
+    new_buf = bytearray(buf)
+    offset = 32
+    patched = False
+    for _ in range(ncmds):
+        cmd, cmdsize = struct.unpack_from('<II', new_buf, offset)
+        if cmd == LC_BUILD_VERSION:
+            platform = struct.unpack_from('<I', new_buf, offset + 8)[0]
+            if platform == PLATFORM_IOS:
+                struct.pack_into('<I', new_buf, offset + 8,
+                                 PLATFORM_IOS_SIMULATOR)
+                patched = True
+        offset += cmdsize
+    return bytes(new_buf), patched
+
+
+def _patch_static_archive(archive_path):
+    with open(archive_path, 'rb') as f:
+        data = f.read()
+    if data[:8] != b'!<arch>\n':
+        return 0
+    out = bytearray(data[:8])
+    pos = 8
+    n_patched = 0
+    while pos + 60 <= len(data):
+        header = data[pos:pos + 60]
+        name = header[:16].rstrip().decode('ascii', errors='replace')
+        try:
+            size = int(header[48:58].rstrip().decode('ascii', errors='replace'))
+        except ValueError:
+            break
+        body_start = pos + 60
+        body_end = body_start + size
+        body = data[body_start:body_end]
+        if name.startswith('#1/'):  # BSD long-name extension
+            try:
+                name_len = int(name[3:])
+            except ValueError:
+                name_len = 0
+            obj_buf = data[body_start + name_len:body_end]
+            new_obj, patched = _patch_macho_object(obj_buf)
+            new_body = body[:name_len] + new_obj
+        else:
+            new_obj, patched = _patch_macho_object(body)
+            new_body = new_obj
+        if patched:
+            n_patched += 1
+        out += header + new_body
+        pos = body_end + (body_end & 1)  # 2-byte alignment
+    if n_patched > 0:
+        with open(archive_path, 'wb') as f:
+            f.write(bytes(out))
+    return n_patched
+
+
+def _patch_thin(path):
+    with open(path, 'rb') as f:
+        head = f.read(8)
+    if head[:8] == b'!<arch>\n':
+        return _patch_static_archive(path)
+    if len(head) >= 4 and struct.unpack('<I', head[:4])[0] == MH_MAGIC_64:
+        with open(path, 'rb') as f:
+            data = f.read()
+        new_data, patched = _patch_macho_object(data)
+        if patched:
+            with open(path, 'wb') as f:
+                f.write(new_data)
+            return 1
+    return 0
+
+
+def _patch_fat_binary(fat_path):
+    with open(fat_path, 'rb') as f:
+        head = f.read(4)
+    if len(head) < 4:
+        return 0
+    magic = struct.unpack('>I', head[:4])[0]
+    if magic in (FAT_MAGIC, FAT_MAGIC_64):
+        archs = subprocess.run(
+            ['lipo', '-archs', fat_path],
+            capture_output=True, text=True, check=True,
+        ).stdout.strip().split()
+        if 'arm64' not in archs:
+            return 0
+        with tempfile.TemporaryDirectory() as td:
+            arm64_thin = os.path.join(td, 'arm64.bin')
+            subprocess.run(
+                ['lipo', fat_path, '-thin', 'arm64', '-output', arm64_thin],
+                check=True,
+            )
+            n = _patch_thin(arm64_thin)
+            if n == 0:
+                return 0
+            subprocess.run(
+                ['lipo', fat_path, '-replace', 'arm64', arm64_thin,
+                 '-output', fat_path],
+                check=True,
+            )
+            return n
+    return _patch_thin(fat_path)
+
+
+def _find_framework_binary(pod_dir):
+    fw_dir = os.path.join(pod_dir, 'Frameworks')
+    if not os.path.isdir(fw_dir):
+        return None
+    for name in os.listdir(fw_dir):
+        if name.endswith('.framework'):
+            base = name[:-len('.framework')]
+            binary = os.path.join(fw_dir, name, base)
+            if os.path.isfile(binary):
+                return binary
+    return None
+
+
+def main(args):
+    if not args:
+        print(__doc__, file=sys.stderr)
+        return 1
+    total = 0
+    for path in args:
+        binary = _find_framework_binary(path)
+        if not binary:
+            continue
+        n = _patch_fat_binary(binary)
+        if n > 0:
+            print(f'  patched {os.path.basename(binary)}: '
+                  f'{n} object(s) relabeled to iOS Simulator')
+            total += n
+    if total > 0:
+        print(f'[ml_kit] Total Mach-O objects relabeled: {total}')
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))

packages/google_mlkit_document_scanner/android/src/main/kotlin/com/google_mlkit_document_scanner/DocumentScanner.kt

@@ -142,10 +142,12 @@ class DocumentScanner(
 
                 Activity.RESULT_CANCELED -> {
                     pendingResult?.error(TAG, "Operation cancelled", null)
+                    pendingResult = null
                 }
 
                 else -> {
                     pendingResult?.error(TAG, "Unknown Error", null)
+                    pendingResult = null
                 }
             }
             return true
@@ -175,5 +177,6 @@ class DocumentScanner(
         }
 
         pendingResult?.success(resultMap)
+        pendingResult = null
     }
 }