Merge "Simplify UserHandle.equals"

2023-06-09 18:03:00 +00:00
parent 6daa1f6d72 5a5038ddb8
commit fd971bb180
1 changed files with 3 additions and 6 deletions
--- 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;
    }