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

Commit 17d96868 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android Git Automerger
Browse files

am 839eb7af: am 227fc315: am c20c4ab7: am 4654ffdc: am 8e1c6a06: Merge... 

am 839eb7af: am 227fc315: am c20c4ab7: am 4654ffdc: am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev

* commit '839eb7afa34ccfb46edf1eb6706608f33978b8df':
  Speculative fix of IMMS crash
parents 0cd30f77 95e6316f

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;

        }

    }