summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohei Yukawa <yukawa@google.com> 2015-08-05 18:07:16 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-05 18:07:16 +0000
commita512415e13def82532e89fa763f3c8b5ce8bcc7c (patch)
tree47c3bc7a39f2d9979306fa46eb5ade290517a5ea
parent106e4f4ca06003ed2cf57bddb24f46a1142cdc49 (diff)
parentdb221acce269245d630e8eb456501c5c6241447b (diff)
am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev
* commit 'db221acce269245d630e8eb456501c5c6241447b': 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);