From a67d02881b90c875500c0ebadd0dbbc6b111960a Mon Sep 17 00:00:00 2001
From: Gary Qian <garyq@google.com>
Date: Mon, 10 Dec 2018 16:04:23 -0800
Subject: [PATCH] Return null when locale has not been set in loocale closure.
 (flutter/engine#6936)

---
 engine/src/flutter/lib/ui/hooks.dart | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/engine/src/flutter/lib/ui/hooks.dart b/engine/src/flutter/lib/ui/hooks.dart
index 54c5033b40c..1262a51ec12 100644
--- a/engine/src/flutter/lib/ui/hooks.dart
+++ b/engine/src/flutter/lib/ui/hooks.dart
@@ -42,7 +42,12 @@ void _updateWindowMetrics(double devicePixelRatio,
 
 typedef _LocaleClosure = String Function();
 
-String _localeClosure() => window.locale.toString();
+String _localeClosure() {
+  if (window.locale == null) {
+    return null;
+  }
+  return window.locale.toString();
+}
 
 @pragma('vm:entry-point')
 _LocaleClosure _getLocaleClosure() => _localeClosure;