summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2016-09-16 12:12:14 +0900
committergitbuildkicker <android-build@google.com>2016-09-27 15:58:50 -0700
commit9e812be46b6f7be61524e14652ba380c02518262 (patch)
treee54d265617cb80752be5b08b936af5f811f96f0c
parent115baf8f0fb54fa86db6afc489ab8413ff714e46 (diff)
downloadframeworks_base-9e812be46b6f7be61524e14652ba380c02518262.zip
frameworks_base-9e812be46b6f7be61524e14652ba380c02518262.tar.gz
frameworks_base-9e812be46b6f7be61524e14652ba380c02518262.tar.bz2
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug: 30568284 Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2 (manually cherry picked from 9b2997d22e6ce2a15065d8e7608dd77b316c2065) (cherry picked from commit 7bb4c825585d5a6afbb59484ec7db5f5dec1bdaf)
-rw-r--r--services/core/java/com/android/server/InputMethodManagerService.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 6d07a57..f2058a5 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -2949,10 +2949,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
Slog.d(TAG, "Found an input method " + p);
}
- } catch (XmlPullParserException e) {
- Slog.w(TAG, "Unable to load input method " + compName, e);
- } catch (IOException e) {
- Slog.w(TAG, "Unable to load input method " + compName, e);
+ } catch (Exception e) {
+ Slog.wtf(TAG, "Unable to load input method " + compName, e);
}
}