Catch more Exceptions for reading InputMethodSubtype.

Bug: 30568284

Change-Id: I21d256a81e4c79ef072b20e35162bc8cb7d48e70

diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java
index 281babe..661b52f 100644 (file)
--- a/core/java/android/view/inputmethod/InputMethodInfo.java
+++ b/core/java/android/view/inputmethod/InputMethodInfo.java
@@ -213,7 +213,7 @@ public final class InputMethodInfo implements Parcelable {
                     subtypes.add(subtype);
                 }
             }
-        } catch (NameNotFoundException e) {
+        } catch (NameNotFoundException | IndexOutOfBoundsException | NumberFormatException e) {
             throw new XmlPullParserException(
                     "Unable to create context for: " + si.packageName);
         } finally {