From 5a5038ddb87b9c4ac576935b77cab4688169ee48 Mon Sep 17 00:00:00 2001 From: Santiago Seifert Date: Fri, 9 Jun 2023 16:00:11 +0000 Subject: [PATCH] Simplify UserHandle.equals The resulting implementation is computationally cheaper by saving the exception handling. Bug: 286548714 Bug: 205124386 Change-Id: Icdf4d42155bad9c9277650ce0344215438c07a99 Test: m Test: mp droid --- core/java/android/os/UserHandle.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index 3d5abb3b8a2f3..f9307b4b87acf 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -597,12 +597,9 @@ public final class UserHandle implements Parcelable { @Override public boolean equals(@Nullable Object obj) { - try { - if (obj != null) { - UserHandle other = (UserHandle)obj; - return mHandle == other.mHandle; - } - } catch (ClassCastException ignore) { + if (obj instanceof UserHandle) { + UserHandle other = (UserHandle) obj; + return mHandle == other.mHandle; } return false; }