commit f29330480ef827b0b47d7fc0023ca281f415dd20
author android-build-team Robot <android-build-team-robot@google.com> Wed Jan 02 04:08:32 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 02 04:08:32 2019 +0000
tree e5f43f1e283ea6f6f84a3563942132fc012a2aa9
parent 1185cf868c527d1e86c82fb924167e1719e30863
parent 9f7fdc0dabfd1f55b4d346872125e9247b0c3c9f

Snap for 5205382 from 9f7fdc0dabfd1f55b4d346872125e9247b0c3c9f to qt-release

Change-Id: Ia02d554722e8ce470aeba6d11ce78994b138e8ce

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 8d6cb09..5a7739c 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -390,12 +390,11 @@
     };
 
     private void restoreNonVrImeFromSettingsNoCheck() {
-        mIsVrImeStarted = false;
         // switch back to non-VR InputMethod from settings.
         synchronized (mMethodMap) {
-            final String lastInputId = mSettings.getSelectedInputMethod();
-            setInputMethodLocked(lastInputId,
-                    mSettings.getSelectedInputMethodSubtypeId(lastInputId));
+            if (!mIsVrImeStarted) return;
+            mIsVrImeStarted = false;
+            updateFromSettingsLocked(false);
         }
     }