diff options
| -rw-r--r-- | core/java/android/content/ComponentName.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/core/java/android/content/ComponentName.java b/core/java/android/content/ComponentName.java index 5f859846a5c1..f12e971afb1f 100644 --- a/core/java/android/content/ComponentName.java +++ b/core/java/android/content/ComponentName.java @@ -314,17 +314,14 @@ public final class ComponentName implements Parcelable, Cloneable, Comparable<Co */ @Override public boolean equals(@Nullable Object obj) { - try { - if (obj != null) { - ComponentName other = (ComponentName)obj; - // Note: no null checks, because mPackage and mClass can - // never be null. - return mPackage.equals(other.mPackage) - && mClass.equals(other.mClass); - } - } catch (ClassCastException e) { + if (obj instanceof ComponentName) { + ComponentName other = (ComponentName) obj; + // mPackage and mClass can never be null. + return mPackage.equals(other.mPackage) + && mClass.equals(other.mClass); + } else { + return false; } - return false; } @Override |