Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: flutter/flutter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fcf2c11572af
Choose a base ref
...
head repository: flutter/flutter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 077b4a4ce10a
Choose a head ref
  • 5 commits
  • 8 files changed
  • 3 contributors

Commits on Jul 7, 2025

  1. [CP-stable]Make _layoutBoundary a boolean 2 (#171106)

    This pull request is created by [automatic cherry pick workflow](https://github.com/flutter/flutter/blob/main/docs/releases/Flutter-Cherrypick-Process.md#automatically-creates-a-cherry-pick-request)
    Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.
    
    ### Issue Link:
    What is the link to the issue this cherry-pick is addressing?
    
    #168936.
    
    ### Changelog Description:
    Explain this cherry pick in one line that is accessible to most Flutter developers. See [best practices](https://github.com/flutter/flutter/blob/main/docs/releases/Hotfix-Documentation-Best-Practices.md) for examples
    
    Fixes a "Null check operator used on a null value" crash when a scroll view contains a `LayoutBuilder`.
    
    ### Impact Description:
    What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch)
    
    The app may crash if there a `LayoutBuilder` child inside of a `RenderSliverMultiBoxAdaptor` (which `SliverList` uses), and that child suddenly becomes offstage and kept-alive.
    
    One example is when you have a TextField inside of a LayoutBuilder which is part of a `SliverList`. The app crashes ("Null check operator used on a null value") even in release mode when the user drags so that the text field becomes offscreen. All 3 are popular widgets so I think this combination will not be that uncommon.
    
    ### Workaround:
    Is there a workaround for this issue?
    
    There's no known workaround for this issue. You can increase the cache extent to prevent the child from becoming kept-alive but this is not really feasible for long / infinite list as it will go OOM fast.
    
    ### Risk:
    What is the risk level of this cherry-pick?
    
    This should be a relatively safe fix. 
    
    Despite changing an important flag in RenderObject from `RenderObject?` to `bool?`, there's only one change in behavior:
    
    in `RenderObject.dropChild`: https://github.com/flutter/flutter/pull/169958/files#diff-4c298197a8aa7831a26eece096c8b8b07773ba1f5376d848ea4ef2924b606e9fL2052
    which originally set the flag to `null` for the entire subtree until a new relayout boundary is reached, now it only sets the flag to `null` for the root of the subtree.
    In release mode, the only place the framework cares about whether the flag is null is [here](https://github.com/flutter/flutter/pull/169958/files#diff-4c298197a8aa7831a26eece096c8b8b07773ba1f5376d848ea4ef2924b606e9fR2342) (everywhere else `null` just means `false`), and that won't actually introduce any correctness issues because if the node originally enters the `if` block in line 2343 it will still enter the `if` block after the patch.
    
    Also, the fix was merged a couple weeks ago and I haven't seen bug reports associated with the fix yet.
    
    ### Test Coverage:
    Are you confident that your fix is well-tested by automated tests?
    
    ### Validation Steps:
    What are the steps to validate that this fix works?
    
    follow the repro steps in #168936, or 
    run the test (already checked in in `master`)
    
    ```dart  
    testWidgets('LayoutBuilder does not crash when it becomes kept-alive', (
        WidgetTester tester,
      ) async {
        final FocusNode focusNode = FocusNode();
        final TextEditingController controller = TextEditingController();
        addTearDown(focusNode.dispose);
        addTearDown(controller.dispose);
        final Widget layoutBuilderWithParent = SizedBox(
          key: GlobalKey(),
          child: LayoutBuilder(
            builder: (BuildContext _, BoxConstraints _) {
              // The text field keeps the widget alive in the SliverList.
              return EditableText(
                focusNode: focusNode,
                backgroundCursorColor: const Color(0xFFFFFFFF),
                cursorColor: const Color(0xFFFFFFFF),
                style: const TextStyle(),
                controller: controller,
              );
            },
          ),
        );
    
        await tester.pumpWidget(
          Directionality(
            textDirection: TextDirection.ltr,
            child: CustomScrollView(
              slivers: <Widget>[
                SliverList.list(
                  addRepaintBoundaries: false,
                  addSemanticIndexes: false,
                  children: <Widget>[const SizedBox(height: 60), layoutBuilderWithParent],
                ),
              ],
            ),
          ),
        );
        focusNode.requestFocus();
        await tester.pumpWidget(
          Directionality(
            textDirection: TextDirection.ltr,
            child: CustomScrollView(
              slivers: <Widget>[
                SliverList.list(
                  addRepaintBoundaries: false,
                  addSemanticIndexes: false,
                  children: <Widget>[const SizedBox(height: 6000), layoutBuilderWithParent],
                ),
              ],
            ),
          ),
        );
      });
    ```
    flutteractionsbot authored Jul 7, 2025
    Configuration menu
    Copy the full SHA
    d779fc7 View commit details
    Browse the repository at this point in the history
  2. [CP-stable][Impeller] Make ContextVK hash values globally unique (#17…

    …1239)
    
    This pull request is created by [automatic cherry pick workflow](https://github.com/flutter/flutter/blob/main/docs/releases/Flutter-Cherrypick-Process.md#automatically-creates-a-cherry-pick-request)
    Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.
    
    ### Issue Link:
    What is the link to the issue this cherry-pick is addressing?
    
    #170141
    
    ### Changelog Description:
    Explain this cherry pick in one line that is accessible to most Flutter developers. See [best practices](https://github.com/flutter/flutter/blob/main/docs/releases/Hotfix-Documentation-Best-Practices.md) for examples
    
    Fixes an issue in the Impeller Vulkan back end that can cause crashes when transitioning between different Android activities that use Flutter.
    
    ### Impact Description:
    What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch)
    
    Potential crash in apps with multiple Android activities running Flutter with Impeller/Vulkan.
    
    ### Workaround:
    Is there a workaround for this issue?
    
    Disable Impeller
    
    ### Risk:
    What is the risk level of this cherry-pick?
    
    ### Test Coverage:
    Are you confident that your fix is well-tested by automated tests?
    
    ### Validation Steps:
    What are the steps to validate that this fix works?
    
    The `appShortcutLaunchActivityAfterStarting` test for the `quick_actions_android` plugin will no longer crash on Firebase Test Lab after this fix is applied.  I don't know of a simpler way to manually verify the fix.
    flutteractionsbot authored Jul 7, 2025
    Configuration menu
    Copy the full SHA
    331c569 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2025

  1. [stable] [android] release background image readers on <= Android 14 (#…

    …171737)
    
    CP of #171193. 
    
    Template:
    
    - Impacted Users (Approximately who will hit this issue, ex. all Flutter devs, Windows developers, all end-customers, apps using X framework feature).
    
    All end users on Android 10-13 (inclusive) using an app with platform views.
    
    - Impact Description (What is the impact? ex. visual jank on Samsung phones, app crash, cannot ship an iOS app. Does it impact development? ex. flutter doctor crashes when Android Studio is installed. Or shipping a production app? ex. the app crashes on launch).
    
    Full app crash when backgrounding and then bringing the app back up.
    
    - Workaround (Is there a workaround for this issue?)
    
    No workaround.
    
    - Risk (What is the risk level of this cherry-pick?)
    
    Medium
    
    - Test Coverage (Are you confident that your fix is well-tested by automated tests?)
    
    No
    
    - Validation Steps (What are the steps to validate that this fix works?)
    
    Launch an app with platform views on these api levels and background them, and then bring the app back up.
    gmackall authored Jul 8, 2025
    Configuration menu
    Copy the full SHA
    72f2b18 View commit details
    Browse the repository at this point in the history
  2. Update CHANGELOG for 3.32.6 stable hotfix (#171793)

    Updates `CHANGELOG` to reference the cherry-picks included in the 3.32.6 stable hotfix release:
    #171106
    #171239
    #171737
    camsim99 authored Jul 8, 2025
    Configuration menu
    Copy the full SHA
    194ab59 View commit details
    Browse the repository at this point in the history
  3. Update engine.version for 3.32.6 stable hotfix release (#171791)

    Updates `engine.version` for 3.32.6 stable hotfix release to the last cherry-pick SHA with an engine change: 72f2b18
    camsim99 authored Jul 8, 2025
    Configuration menu
    Copy the full SHA
    077b4a4 View commit details
    Browse the repository at this point in the history
Loading