diff options
| author | Yohei Yukawa <yukawa@google.com> | 2014-09-19 13:22:15 +0900 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2014-09-19 05:02:59 +0000 |
| commit | fcedfa01907d8a5f804974a4a3585498e8d6c261 (patch) | |
| tree | 7018a04f6d9e7ba0dc9fb7f06f8ba60826fd0868 /core/java/android/view/inputmethod | |
| parent | c55214a95caf1ebd9fe37a328f7e8d36efcde7bd (diff) | |
| download | frameworks_base-fcedfa01907d8a5f804974a4a3585498e8d6c261.zip frameworks_base-fcedfa01907d8a5f804974a4a3585498e8d6c261.tar.gz frameworks_base-fcedfa01907d8a5f804974a4a3585498e8d6c261.tar.bz2 | |
Speculative fix of IMMS crash
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.
Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().
BUG: 17553712
BUG: 17549437
BUG: 17517332
Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
Diffstat (limited to 'core/java/android/view/inputmethod')
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodInfo.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java index 0a8e4b9..11d0f4a 100644 --- a/core/java/android/view/inputmethod/InputMethodInfo.java +++ b/core/java/android/view/inputmethod/InputMethodInfo.java @@ -27,6 +27,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.res.Resources; +import android.content.res.Resources.NotFoundException; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.graphics.drawable.Drawable; @@ -421,7 +422,7 @@ public final class InputMethodInfo implements Parcelable { } final Resources res = context.createPackageContext(getPackageName(), 0).getResources(); return res.getBoolean(getIsDefaultResourceId()); - } catch (NameNotFoundException e) { + } catch (NameNotFoundException | NotFoundException e) { return false; } } |