summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohei Yukawa <yukawa@google.com> 2015-08-05 18:20:18 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-05 18:20:18 +0000
commit524e2f9c763adac6a6e02ccf85f77bc4b7a4fbca (patch)
treec1b22ff7be9f43e402de581128b1bee39e826aa0
parentc89da1c70c3f202052f85ccca9145eda04817deb (diff)
parent721a1fcd88a4e1b3eeb11c1c6f4739abe4e6f315 (diff)
am 721a1fcd: am a512415e: am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev
* commit '721a1fcd88a4e1b3eeb11c1c6f4739abe4e6f315': Reduce log spam for the ease of debugging Bug 22857361.
-rw-r--r--services/core/java/com/android/server/InputMethodManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 64ee5f1a1037..4e110705050b 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -3555,7 +3555,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
? new File(Environment.getDataDirectory(), SYSTEM_PATH)
: Environment.getUserSystemDirectory(userId);
final File inputMethodDir = new File(systemDir, INPUT_METHOD_PATH);
- if (!inputMethodDir.mkdirs()) {
+ if (!inputMethodDir.exists() && !inputMethodDir.mkdirs()) {
Slog.w(TAG, "Couldn't create dir.: " + inputMethodDir.getAbsolutePath());
}
final File subtypeFile = new File(inputMethodDir, ADDITIONAL_SUBTYPES_FILE_NAME);