commit 4906a651fa26cc80c33beeddda3993a548649d09
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jun 11 20:22:18 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 11 20:22:18 2024 +0000
tree cf943714e2164ca6a7161b66dcea519b1376bae1
parent aa402b2eadb18e809a263e4763072f9205f34a63
parent 417077521bfff367f7bebba53cd5da88cacbfe19

Merge "Initialize mTouchInputMethod properly" into main

src/com/android/car/rotary/RotaryService.java

diff --git a/src/com/android/car/rotary/RotaryService.java b/src/com/android/car/rotary/RotaryService.java
index 828137f..c85e893 100644
--- a/src/com/android/car/rotary/RotaryService.java
+++ b/src/com/android/car/rotary/RotaryService.java
@@ -631,12 +631,13 @@
         validateImeConfiguration(mDefaultTouchInputMethod);
         mTouchInputMethod = mPrefs.getString(TOUCH_INPUT_METHOD_PREFIX
                 + mUserManager.getUserName(), mDefaultTouchInputMethod);
-        if (mTouchInputMethod.isEmpty()) {
+        // TODO(b/346437360): use a better way to initialize mTouchInputMethod.
+        if (mTouchInputMethod.isEmpty()
+                || !Utils.isInstalledIme(mTouchInputMethod, mInputMethodManager)) {
             // Workaround for b/323013736.
-            L.e("mTouchInputMethod shouldn't be empty!");
+            L.e("mTouchInputMethod is empty or not installed!");
             mTouchInputMethod = mDefaultTouchInputMethod;
         }
-        validateImeConfiguration(mTouchInputMethod);
 
         if (mRotaryInputMethod != null && mRotaryInputMethod.equals(getCurrentIme())) {
             // Switch from the rotary IME to the touch IME in case Android defaults to the rotary