From 5ae64381578c8aa27c830609ff9126e2998534cd Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Thu, 18 May 2023 10:47:54 -0700 Subject: [PATCH] Revert "Handle null return from WillPopCallback" (#127112) Reverts flutter/flutter#127039 Google3 has been fixed, so this work around is no longe necessary. --- packages/flutter/lib/src/widgets/routes.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/flutter/lib/src/widgets/routes.dart b/packages/flutter/lib/src/widgets/routes.dart index 76b8814dbc059..7cd4ead6ef067 100644 --- a/packages/flutter/lib/src/widgets/routes.dart +++ b/packages/flutter/lib/src/widgets/routes.dart @@ -1499,9 +1499,7 @@ abstract class ModalRoute extends TransitionRoute with LocalHistoryRoute? scope = _scopeKey.currentState; assert(scope != null); for (final WillPopCallback callback in List.of(_willPopCallbacks)) { - // TODO(goderbauer): Tests using the Component Framework in google3 insist on returning - // null for mocked out WillPopCallbacks. Fix that to remove ignore. - if (await callback() != true) { // ignore: no_literal_bool_comparisons + if (!await callback()) { return RoutePopDisposition.doNotPop; } }