Fix M17N broken connection.

Skip decoder check for the ime_spec when it's M17N request.



Bug: 1166064
Change-Id: Ib02db10805d5c222c9767e54c46367b00096587d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2626864Reviewed-by: Leo Zhang <googleo@chromium.org>
Reviewed-by: Darren Shen <shend@chromium.org>
Commit-Queue: Leo Zhang <googleo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843879}

chromeos/services/ime/decoder/decoder_engine.cc

@@ -100,6 +100,10 @@ bool DecoderEngine::BindRequest(
 }
 
 bool DecoderEngine::IsImeSupportedByDecoder(const std::string& ime_spec) {
+  // M17N request will always fallback to built-in rulebased IMEs.
+  if (InputEngine::IsImeSupportedByRulebased(ime_spec)) {
+    return false;
+  }
   if (decoder_entry_points_) {
     return decoder_entry_points_->supports(ime_spec.c_str());
   }

chromeos/services/ime/decoder/system_engine.cc

@@ -133,6 +133,10 @@ bool SystemEngine::BindRequest(
 }
 
 bool SystemEngine::IsImeSupportedByDecoder(const std::string& ime_spec) {
+  // M17N request will always fallback to built-in rulebased IMEs.
+  if (InputEngine::IsImeSupportedByRulebased(ime_spec)) {
+    return false;
+  }
   return decoder_entry_points_ &&
          decoder_entry_points_->supports(ime_spec.c_str());
 }

chromeos/services/ime/input_engine.h

@@ -73,10 +73,11 @@ class InputEngine : public mojom::InputChannel {
 
   // TODO(https://crbug.com/837156): Implement a state for the interface.
 
- private:
+ protected:
   // Returns whether the given ime_spec is supported by rulebased engine.
   bool IsImeSupportedByRulebased(const std::string& ime_spec);
 
+ private:
   mojo::ReceiverSet<mojom::InputChannel, std::unique_ptr<InputEngineContext>>
       channel_receivers_;