[pull] master from flutter:master

.ci.yaml

@@ -26,6 +26,7 @@ platform_properties:
       cores: "8"
       device_type: none
       ignore_flakiness: "true"
+
   linux:
     properties:
       dependencies: >-
@@ -35,6 +36,7 @@ platform_properties:
       os: Ubuntu
       cores: "8"
       device_type: none
+
   # The current android emulator config names can be found here:
   # https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/proto
   # You may use those names for the android_virtual_device version. You may find the
@@ -58,6 +60,7 @@ platform_properties:
       cores: "8"
       device_type: none
       kvm: "1"
+
   # linux_android_emu_unstable is intended to be how flutter-android proves the stability
   # of new combinations of dependencies.
   linux_android_emu_unstable:
@@ -77,6 +80,7 @@ platform_properties:
       cores: "8"
       device_type: none
       kvm: "1"
+
   linux_build_test:
     properties:
       dependencies: >-
@@ -88,16 +92,6 @@ platform_properties:
       os: Ubuntu
       cores: "8"
       device_type: none
-  linux_android:
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "android_sdk", "version": "version:36v1"},
-          {"dependency": "open_jdk", "version": "version:21"},
-          {"dependency": "curl", "version": "version:7.64.0"}
-        ]
-      os: Linux
-      device_type: "msm8952"
 
   linux_pixel_7pro:
     properties:
@@ -148,6 +142,7 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+
   mac_arm64:
     properties:
       contexts: >-
@@ -165,6 +160,7 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+
   mac_benchmark:
     properties:
       contexts: >-
@@ -184,6 +180,7 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+
   mac_x64:
     properties:
       contexts: >-
@@ -201,6 +198,7 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+
   mac_build_test:
     properties:
       contexts: >-
@@ -219,27 +217,6 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-  mac_android:
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "android_sdk", "version": "version:36v1"},
-          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
-          {"dependency": "open_jdk", "version": "version:21"}
-        ]
-      os: Mac-14|Mac-15.5
-      cpu: x86
-      device_type: "msm8952"
-  mac_arm64_android:
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "android_sdk", "version": "version:36v1"},
-          {"dependency": "open_jdk", "version": "version:21"}
-        ]
-      os: Mac-14|Mac-15.5
-      cpu: arm64
-      device_type: "msm8952"
 
   mac_mokey:
     properties:
@@ -252,6 +229,7 @@ platform_properties:
       os: Mac-14|Mac-15.5
       cpu: x86
       device_type: "mokey"
+
   mac_arm64_mokey:
     properties:
       dependencies: >-
@@ -263,16 +241,6 @@ platform_properties:
       cpu: arm64
       device_type: "mokey"
 
-  mac_pixel_7pro:
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "android_sdk", "version": "version:36v1"},
-          {"dependency": "open_jdk", "version": "version:21"}
-        ]
-      os: Mac-14|Mac-15.5
-      cpu: x86
-      device_type: "Pixel 7 Pro"
   mac_ios:
     properties:
       contexts: >-
@@ -290,6 +258,7 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+
   mac_x64_ios:
     properties:
       contexts: >-
@@ -308,6 +277,7 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+
   mac_arm64_ios:
     properties:
       contexts: >-
@@ -326,26 +296,18 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+
   windows:
     properties:
       os: Windows-10
       device_type: none
+
   windows_arm64:
     properties:
-      # The arch can be removed after https://github.com/flutter/flutter/issues/135722.
       arch: arm
       os: Windows
       cpu: arm64
-  windows_android:
-    properties:
-      dependencies: >-
-        [
-          {"dependency": "android_sdk", "version": "version:36v1"},
-          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
-          {"dependency": "open_jdk", "version": "version:21"}
-        ]
-      os: Windows-10
-      device_type: "msm8952"
+
   windows_mokey:
     properties:
       dependencies: >-

bin/internal/libimobiledevice.version

@@ -1 +1 @@
-2ba8188ed97d8b05670845e5b5954e2fe0f54784
+0bf0f9e941c85d06ce4b5909d7a61b3a4f2a6a05

bin/internal/libimobiledeviceglue.version

@@ -0,0 +1 @@
+050ff3bf8fdab6ce53a2ddc6ae49b11b1c02a168

bin/internal/libplist.version

@@ -1 +1 @@
-20a2f8dbddcf1a96ad4c720b9afd1d0876d17ffc
+cf5897a71ea412ea2aeb1e2f6b5ea74d4fabfd8c

bin/internal/libusbmuxd.version

@@ -0,0 +1 @@
+19d6bec393c9f9b31ccb090059f59268da32e281

bin/internal/openssl.version

@@ -1 +1 @@
-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72
+22dbb176deef7d9a80f5c94f57a4b518ea935f50

dev/benchmarks/macrobenchmarks/lib/src/web/material3.dart

@@ -870,7 +870,6 @@ class _RadiosState extends State<Radios> {
             title: const Text('Option 3'),
             value: Options.option3,
             groupValue: _selectedOption,
-            onChanged: null,
           ),
         ],
       ),

dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart

@@ -62,11 +62,12 @@ List<String> binariesWithEntitlements(String flutterRoot) {
     'artifacts/libimobiledevice/idevicescreenshot',
     'artifacts/libimobiledevice/idevicesyslog',
     'artifacts/libimobiledevice/libimobiledevice-1.0.6.dylib',
-    'artifacts/libplist/libplist-2.0.3.dylib',
-    'artifacts/openssl/libcrypto.1.1.dylib',
-    'artifacts/openssl/libssl.1.1.dylib',
-    'artifacts/usbmuxd/iproxy',
-    'artifacts/usbmuxd/libusbmuxd-2.0.6.dylib',
+    'artifacts/libimobiledeviceglue/libimobiledevice-glue-1.0.0.dylib',
+    'artifacts/libplist/libplist-2.0.4.dylib',
+    'artifacts/openssl/libcrypto.3.dylib',
+    'artifacts/openssl/libssl.3.dylib',
+    'artifacts/libusbmuxd/iproxy',
+    'artifacts/libusbmuxd/libusbmuxd-2.0.7.dylib',
     'dart-sdk/bin/dart',
     'dart-sdk/bin/dartaotruntime',
     'dart-sdk/bin/utils/gen_snapshot',

dev/devicelab/lib/framework/devices.dart

@@ -1046,8 +1046,9 @@ class IosDevice extends Device {
     final List<String> dylibsPaths = <String>[
       path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'libimobiledevice'),
       path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'openssl'),
-      path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'usbmuxd'),
+      path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'libusbmuxd'),
       path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'libplist'),
+      path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'libimobiledeviceglue'),
     ];
     return dylibsPaths.join(':');
   }

dev/integration_tests/flutter_gallery/lib/demo/material/selection_controls_demo.dart

@@ -155,9 +155,9 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
           const Row(
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
-              Radio<int>(value: 0, groupValue: 0, onChanged: null),
-              Radio<int>(value: 1, groupValue: 0, onChanged: null),
-              Radio<int>(value: 2, groupValue: 0, onChanged: null),
+              Radio<int>(value: 0, groupValue: 0),
+              Radio<int>(value: 1, groupValue: 0),
+              Radio<int>(value: 2, groupValue: 0),
             ],
           ),
         ],

dev/integration_tests/flutter_gallery/lib/gallery/example_code.dart

@@ -179,7 +179,7 @@ class SelectionControls {
     );
 
     // Creates a disabled radio button.
-    const Radio<int>(value: 0, groupValue: 0, onChanged: null);
+    const Radio<int>(value: 0, groupValue: 0);
     // END
 
     // START selectioncontrols_switch

dev/integration_tests/flutter_gallery/test/demo/material/expansion_panels_demo_test.dart

@@ -38,14 +38,15 @@ Widget get _radioPanelExpandIcon => _expandIcons.evaluate().toList()[1].widget;
 
 bool _isRadioSelected(int index) => _radios[index].value == _radios[index].groupValue;
 
-List<Radio<Location>> get _radios =>
-    List<Radio<Location>>.from(_radioFinder.evaluate().map<Widget>((Element e) => e.widget));
+List<RadioListTile<Location>> get _radios => List<RadioListTile<Location>>.from(
+  _radioFinder.evaluate().map<Widget>((Element e) => e.widget),
+);
 
 // [find.byType] and [find.widgetWithText] do not match subclasses; `Radio` is
 // not sufficient to find a `Radio<_Location>`. Another approach is to grab the
 // `runtimeType` of a dummy instance; see
 // packages/flutter/test/material/radio_list_tile_test.dart.
-Finder get _radioFinder => find.byWidgetPredicate((Widget w) => w is Radio<Location>);
+Finder get _radioFinder => find.byWidgetPredicate((Widget w) => w is RadioListTile<Location>);
 
 List<RadioListTile<Location>> get _radioListTiles => List<RadioListTile<Location>>.from(
   _radioListTilesFinder.evaluate().map<Widget>((Element e) => e.widget),

dev/integration_tests/new_gallery/lib/demos/material/selection_controls_demo.dart

@@ -167,7 +167,7 @@ class _RadioDemoState extends State<_RadioDemo> with RestorationMixin {
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
             for (int index = 0; index < 2; ++index)
-              Radio<int>(value: index, groupValue: radioValue.value, onChanged: null),
+              Radio<int>(value: index, groupValue: radioValue.value),
           ],
         ),
       ],

engine/src/flutter/ci/builders/linux_android_emulator.json

@@ -43,11 +43,11 @@
                     "test_dependencies": [
                         {
                             "dependency": "android_virtual_device",
-                            "version": "android_35_google_apis_x64.textpb"
+                            "version": "android_36_google_apis_x64.textpb"
                         },
                         {
                             "dependency": "avd_cipd_version",
-                            "version": "build_id:8733065022087935185"
+                            "version": "build_id:8719362231152674241"
                         }
                     ],
                     "contexts": [

engine/src/flutter/ci/licenses_golden/licenses_flutter

@@ -53340,6 +53340,9 @@ ORIGIN: ../../../flutter/shell/platform/linux/fl_compositor.h + ../../../flutter
 ORIGIN: ../../../flutter/shell/platform/linux/fl_compositor_opengl.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/linux/fl_compositor_opengl.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/linux/fl_compositor_opengl_test.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_compositor_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_compositor_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/linux/fl_compositor_software_test.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/linux/fl_dart_project.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/linux/fl_dart_project_private.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/linux/fl_dart_project_test.cc + ../../../flutter/LICENSE
@@ -56393,6 +56396,9 @@ FILE: ../../../flutter/shell/platform/linux/fl_compositor.h
 FILE: ../../../flutter/shell/platform/linux/fl_compositor_opengl.cc
 FILE: ../../../flutter/shell/platform/linux/fl_compositor_opengl.h
 FILE: ../../../flutter/shell/platform/linux/fl_compositor_opengl_test.cc
+FILE: ../../../flutter/shell/platform/linux/fl_compositor_software.cc
+FILE: ../../../flutter/shell/platform/linux/fl_compositor_software.h
+FILE: ../../../flutter/shell/platform/linux/fl_compositor_software_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_dart_project.cc
 FILE: ../../../flutter/shell/platform/linux/fl_dart_project_private.h
 FILE: ../../../flutter/shell/platform/linux/fl_dart_project_test.cc