Flush UserSettings to window (flutter#6850)

agd · Nov 14, 2018 · 396402f · 396402f
1 parent 1e7e676
commit 396402f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/lib/ui/hooks.dart b/lib/ui/hooks.dart
@@ -68,6 +68,9 @@ void _updateLocales(List<String> locales) {
 @pragma('vm:entry-point')
 void _updateUserSettingsData(String jsonData) {
   final Map<String, dynamic> data = json.decode(jsonData);
+  if (data.isEmpty) {
+    return;
+  }
   _updateTextScaleFactor(data['textScaleFactor'].toDouble());
   _updateAlwaysUse24HourFormat(data['alwaysUse24HourFormat']);
 }

diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc
@@ -128,7 +128,8 @@ bool RuntimeController::FlushRuntimeStateToIsolate() {
   return SetViewportMetrics(window_data_.viewport_metrics) &&
          SetLocales(window_data_.locale_data) &&
          SetSemanticsEnabled(window_data_.semantics_enabled) &&
-         SetAccessibilityFeatures(window_data_.accessibility_feature_flags_);
+         SetAccessibilityFeatures(window_data_.accessibility_feature_flags_) &&
+         SetUserSettingsData(window_data_.user_settings_data);
 }
 
 bool RuntimeController::SetViewportMetrics(const ViewportMetrics& metrics) {

diff --git a/testing/dart/window_hooks_integration_test.dart b/testing/dart/window_hooks_integration_test.dart
@@ -67,6 +67,12 @@ void main() {
       window.onTextScaleFactorChanged = originalOnTextScaleFactorChanged;
     });
 
+    test('updateUserSettings can handle an empty object', () {
+      // this should now throw.
+      _updateUserSettingsData('{}');
+      expect(true, equals(true));
+    });
+
     test('onMetricsChanged preserves callback zone', () {
       Zone innerZone;
       Zone runZone;