diff options
| author | 2022-10-26 12:40:19 +0000 | |
|---|---|---|
| committer | 2022-10-26 12:40:19 +0000 | |
| commit | fdb083e3492b5456fed4c211df8a43bc47519ece (patch) | |
| tree | 27ae3d65c1b0905eb2fe8e64514c67dab601fcd5 | |
| parent | 34e4450f1cd5130ee0808481a07fa637c399dd08 (diff) | |
| parent | 13202ef31e6b75946634eda71fbe7bbf08c5da6f (diff) | |
Merge "Non-functional simplification of ComponentName.equals" am: 00c792bba0 am: 13202ef31e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2268166
Change-Id: Iaea7147b859fdf26d4853d2cdd77dd2c7add6b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |