commit e7b343fe5377dfb61e1ad0cd68daca9fc0054e36
author Anton Hansson <hansson@google.com> Thu Nov 09 09:22:13 2023 +0000
committer Anton Hansson <hansson@google.com> Thu Nov 09 10:00:17 2023 +0000
tree 670ba58bff00a096c27a23fc54f07523fb95f928
parent 91312868b786854d49e03ad7e211a39fd18a6c20

Fix nullability annotations on equals methods

The equals method in Object takes a Nullable parameter, so all
subclasses must do the same. Fixing these issues allows re-enabling
the InvalidNullabilityOverride error, fix also catches more severe
issues.

Bug: 309908788
Test: m checkapi
Change-Id: Id75ff5fbd70ece6a01ce4525d1b8f745430c4de1

framework/java/android/net/wifi/SoftApCapability.java

diff --git a/framework/java/android/net/wifi/SoftApCapability.java b/framework/java/android/net/wifi/SoftApCapability.java
index 58a760c..9a5afaa 100644
--- a/framework/java/android/net/wifi/SoftApCapability.java
+++ b/framework/java/android/net/wifi/SoftApCapability.java
@@ -380,7 +380,7 @@
     }
 
     @Override
-    public boolean equals(@NonNull Object o) {
+    public boolean equals(@Nullable Object o) {
         if (this == o) return true;
         if (!(o instanceof SoftApCapability)) return false;
         SoftApCapability capability = (SoftApCapability) o;

framework/java/android/net/wifi/SoftApInfo.java

diff --git a/framework/java/android/net/wifi/SoftApInfo.java b/framework/java/android/net/wifi/SoftApInfo.java
index faf064a..89d4782 100644
--- a/framework/java/android/net/wifi/SoftApInfo.java
+++ b/framework/java/android/net/wifi/SoftApInfo.java
@@ -378,7 +378,7 @@
     }
 
     @Override
-    public boolean equals(@NonNull Object o) {
+    public boolean equals(@Nullable Object o) {
         if (this == o) return true;
         if (!(o instanceof SoftApInfo)) return false;
         SoftApInfo softApInfo = (SoftApInfo) o;

framework/java/android/net/wifi/WifiClient.java

diff --git a/framework/java/android/net/wifi/WifiClient.java b/framework/java/android/net/wifi/WifiClient.java
index f47c237..c69b039 100644
--- a/framework/java/android/net/wifi/WifiClient.java
+++ b/framework/java/android/net/wifi/WifiClient.java
@@ -17,6 +17,7 @@
 package android.net.wifi;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.net.MacAddress;
 import android.os.Parcel;
@@ -105,7 +106,7 @@
     }
 
     @Override
-    public boolean equals(@NonNull Object o) {
+    public boolean equals(@Nullable Object o) {
         if (this == o) return true;
         if (!(o instanceof WifiClient)) return false;
         WifiClient client = (WifiClient) o;