Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcedfa01 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

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
parent c55214a9

core/java/android/view/inputmethod/InputMethodInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }