Skip to content

Commit 5680267

Browse files
satok16Android (Google) Code Review
authored andcommitted
Merge "Workaround: Never reset the default IME if the system is not ready" into jb-dev
2 parents edc34cf + 4c0e715 commit 5680267

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2668,7 +2668,16 @@ private void setSelectedInputMethodAndSubtypeLocked(InputMethodInfo imi, int sub
26682668
}
26692669
}
26702670

2671-
if (!setSubtypeOnly) {
2671+
// Workaround.
2672+
// ASEC is not ready in the IMMS constructor. Accordingly, forward-locked
2673+
// IMEs are not recognized and considered uninstalled.
2674+
// Actually, we can't move everything after SystemReady because
2675+
// IMMS needs to run in the encryption lock screen. So, we just skip changing
2676+
// the default IME here and try cheking the default IME again in systemReady().
2677+
// TODO: Do nothing before system ready and implement a separated logic for
2678+
// the encryption lock screen.
2679+
// TODO: ASEC should be ready before IMMS is instantiated.
2680+
if (mSystemReady && !setSubtypeOnly) {
26722681
// Set InputMethod here
26732682
mSettings.putSelectedInputMethod(imi != null ? imi.getId() : "");
26742683
}

0 commit comments

Comments
 (0)