Null check in locale resolution (#23301)

a4651059 · Gary Qian · GitHub · 48fe65c2 · a4651059
Unverified Commit a4651059 authored Oct 19, 2018 by Gary Qian Committed by GitHub Oct 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

app.dart packages/flutter/lib/src/widgets/app.dart +3 -0

No files found.
--- a/packages/flutter/lib/src/widgets/app.dart
+++ b/packages/flutter/lib/src/widgets/app.dart
@@ -678,6 +678,9 @@ class _WidgetsAppState extends State<WidgetsApp> implements WidgetsBindingObserv
  Locale _locale;

  Locale _resolveLocale(Locale newLocale, Iterable<Locale> supportedLocales) {
+    if (newLocale == null) {
+      return supportedLocales.first;
+    }
    if (widget.localeResolutionCallback != null) {
      final Locale locale = widget.localeResolutionCallback(newLocale, widget.supportedLocales);
      if (locale != null)