Merge "Fix UnknownAuthority equals and hashCode" into main

1 files 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