From 57c3836d1a87d7f019cfecd93f72789cb4bab7fd Mon Sep 17 00:00:00 2001 From: Azhara Assanova Date: Mon, 2 Dec 2024 23:09:59 +0000 Subject: Fix UnknownAuthority equals and hashCode Bug: 381312313 Bug: 381314679 Test: atest CtsDevicePolicyTestCases Flag: EXEMPT bugfix Change-Id: Iadd8ecc29f476fc50e2680793379bd8ed3a46921 --- core/java/android/app/admin/UnknownAuthority.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/admin/UnknownAuthority.java b/core/java/android/app/admin/UnknownAuthority.java index 82dcf7e1a115..bebffdea5f02 100644 --- a/core/java/android/app/admin/UnknownAuthority.java +++ b/core/java/android/app/admin/UnknownAuthority.java @@ -74,14 +74,14 @@ public final class UnknownAuthority extends Authority { @Override public boolean equals(@Nullable Object o) { if (this == o) return true; - if (o != null && getClass() == o.getClass()) return false; + if (o == null || getClass() != o.getClass()) return false; UnknownAuthority other = (UnknownAuthority) o; return Objects.equals(mName, other.mName); } @Override public int hashCode() { - return mName.hashCode(); + return Objects.hashCode(mName); } @Override -- cgit v1.2.3-59-g8ed1b