From 9e305177dfc61bb011ff48e350fdfcea853d82b0 Mon Sep 17 00:00:00 2001 From: Filip Filmar Date: Tue, 5 Nov 2019 12:59:25 -0800 Subject: [PATCH] [fuchsia] Temporarily disable intl provider The intention of the property provider is to try to connect, not bail out if connection is not possible. This code tried to connect unconditionally, which is not what we wanted. Removing this initialization code to enable a roll, and will fix in a followup. --- shell/platform/fuchsia/flutter/engine.cc | 50 ------------------- .../flutter/meta/flutter_aot_runner.cmx | 1 - .../meta/flutter_jit_product_runner.cmx | 1 - .../flutter/meta/flutter_jit_runner.cmx | 1 - .../flutter/meta/flutter_runner_tests.cmx | 1 - 5 files changed, 54 deletions(-) diff --git a/shell/platform/fuchsia/flutter/engine.cc b/shell/platform/fuchsia/flutter/engine.cc index 340468d66c30c..6984a6e035659 100644 --- a/shell/platform/fuchsia/flutter/engine.cc +++ b/shell/platform/fuchsia/flutter/engine.cc @@ -41,13 +41,6 @@ static void UpdateNativeThreadLabelNames(const std::string& label, set_thread_name(runners.GetIOTaskRunner(), label, ".io"); } -static fml::RefPtr MakeLocalizationPlatformMessage( - const fuchsia::intl::Profile& intl_profile) { - return fml::MakeRefCounted( - "flutter/localization", MakeLocalizationPlatformMessageData(intl_profile), - nullptr); -} - Engine::Engine(Delegate& delegate, std::string thread_label, std::shared_ptr svc, @@ -263,49 +256,6 @@ Engine::Engine(Delegate& delegate, // notification. Fire one eagerly. shell_->GetPlatformView()->NotifyCreated(); - // Connect to the intl property provider. - { - intl_property_provider_.set_error_handler([](zx_status_t status) { - FML_LOG(ERROR) << "Failed to connect to " - << fuchsia::intl::PropertyProvider::Name_ << ": " - << zx_status_get_string(status); - }); - - // Note that we're using the runner's services, not the component's. - // Flutter locales should be updated regardless of whether the component has - // direct access to the fuchsia.intl.PropertyProvider service. - ZX_ASSERT(runner_services->Connect(intl_property_provider_.NewRequest()) == - ZX_OK); - - auto get_profile_callback = [flutter_runner_engine = - weak_factory_.GetWeakPtr()]( - const fuchsia::intl::Profile& profile) { - if (!flutter_runner_engine) { - return; - } - if (!profile.has_locales()) { - FML_LOG(WARNING) << "Got intl Profile without locales"; - } - auto message = MakeLocalizationPlatformMessage(profile); - FML_VLOG(-1) << "Sending LocalizationPlatformMessage"; - flutter_runner_engine->shell_->GetPlatformView()->DispatchPlatformMessage( - message); - }; - - FML_VLOG(-1) << "Requesting intl Profile"; - - // Make the initial request - intl_property_provider_->GetProfile(get_profile_callback); - - // And register for changes - intl_property_provider_.events().OnChange = [this, runner_services, - get_profile_callback]() { - FML_VLOG(-1) << fuchsia::intl::PropertyProvider::Name_ << ": OnChange"; - runner_services->Connect(intl_property_provider_.NewRequest()); - intl_property_provider_->GetProfile(get_profile_callback); - }; - } - // Launch the engine in the appropriate configuration. auto run_configuration = flutter::RunConfiguration::InferFromSettings( settings_, task_runners.GetIOTaskRunner()); diff --git a/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx b/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx index bdfec3cd2e4d0..358574ef5872a 100644 --- a/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx +++ b/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx @@ -15,7 +15,6 @@ "fuchsia.device.NameProvider", "fuchsia.feedback.CrashReporter", "fuchsia.fonts.Provider", - "fuchsia.intl.PropertyProvider", "fuchsia.net.NameLookup", "fuchsia.netstack.Netstack", "fuchsia.posix.socket.Provider", diff --git a/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx b/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx index 912b534df93a2..cd8c9e09ae1e7 100644 --- a/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx +++ b/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx @@ -15,7 +15,6 @@ "fuchsia.device.NameProvider", "fuchsia.feedback.CrashReporter", "fuchsia.fonts.Provider", - "fuchsia.intl.PropertyProvider", "fuchsia.net.NameLookup", "fuchsia.netstack.Netstack", "fuchsia.posix.socket.Provider", diff --git a/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx b/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx index 912b534df93a2..cd8c9e09ae1e7 100644 --- a/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx +++ b/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx @@ -15,7 +15,6 @@ "fuchsia.device.NameProvider", "fuchsia.feedback.CrashReporter", "fuchsia.fonts.Provider", - "fuchsia.intl.PropertyProvider", "fuchsia.net.NameLookup", "fuchsia.netstack.Netstack", "fuchsia.posix.socket.Provider", diff --git a/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx b/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx index 015acc94b4e47..fedcb77867acb 100644 --- a/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx +++ b/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx @@ -9,7 +9,6 @@ ], "services": [ "fuchsia.accessibility.semantics.SemanticsManager", - "fuchsia.intl.PropertyProvider", "fuchsia.sys.Launcher" ] }