Skip to content

Commit 5ae6438

Browse files
authored
Revert "Handle null return from WillPopCallback" (flutter#127112)
Reverts flutter#127039 Google3 has been fixed, so this work around is no longe necessary.
1 parent 2b95fa6 commit 5ae6438

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

packages/flutter/lib/src/widgets/routes.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,9 +1499,7 @@ abstract class ModalRoute<T> extends TransitionRoute<T> with LocalHistoryRoute<T
14991499
final _ModalScopeState<T>? scope = _scopeKey.currentState;
15001500
assert(scope != null);
15011501
for (final WillPopCallback callback in List<WillPopCallback>.of(_willPopCallbacks)) {
1502-
// TODO(goderbauer): Tests using the Component Framework in google3 insist on returning
1503-
// null for mocked out WillPopCallbacks. Fix that to remove ignore.
1504-
if (await callback() != true) { // ignore: no_literal_bool_comparisons
1502+
if (!await callback()) {
15051503
return RoutePopDisposition.doNotPop;
15061504
}
15071505
}

0 commit comments

Comments
 (0)