commit 0b6f2908c5411aa8d39ad7aab1b10a398c7535dc
author Roman Kalukiewicz <romkal@google.com> Wed Oct 14 15:59:06 2020 -0700
committer Remi NGUYEN VAN <reminv@google.com> Fri Feb 05 07:28:44 2021 +0000
tree 549ab9d2c3d11923bd0e413fe26f5ce1ac746e7a
parent fc1622a827b164b12f5922271abf9df11678a8b7

Add @Nullable to Object#equals()

This is a partial cherry-pick of change:
I5eedb571c9d78862115dfdc5dae1cf2a35343580

for connectivity classes.

Bug: 170883422
Test: m
Merged-In: I5eedb571c9d78862115dfdc5dae1cf2a35343580
Change-Id: I7dc661863b73f4198ddb4f3a1566583d0f07db3c

framework/src/android/net/RouteInfo.java

diff --git a/framework/src/android/net/RouteInfo.java b/framework/src/android/net/RouteInfo.java
index 94f849f..5b6684a 100644
--- a/framework/src/android/net/RouteInfo.java
+++ b/framework/src/android/net/RouteInfo.java
@@ -534,7 +534,7 @@
      * Compares this RouteInfo object against the specified object and indicates if they are equal.
      * @return {@code true} if the objects are equal, {@code false} otherwise.
      */
-    public boolean equals(Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (this == obj) return true;
 
         if (!(obj instanceof RouteInfo)) return false;
@@ -570,7 +570,7 @@
         }
 
         @Override
-        public boolean equals(Object o) {
+        public boolean equals(@Nullable Object o) {
             if (!(o instanceof RouteKey)) {
                 return false;
             }