Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83fc6687 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add @Nullable to Object#equals()" am: 577fd4a9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I523eb00d30bfedeb6e7533a94868016171846a59
parents 93de6ea9 577fd4a9

core/java/android/net/DataUsageRequest.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.net;



import android.annotation.Nullable;

import android.net.NetworkTemplate;

import android.os.Parcel;

import android.os.Parcelable;
@@ -95,7 +96,7 @@ public final class DataUsageRequest implements Parcelable { 
    }



    @Override

    public boolean equals(Object obj) {

    public boolean equals(@Nullable Object obj) {

        if (obj instanceof DataUsageRequest == false) return false;

        DataUsageRequest that = (DataUsageRequest) obj;

        return that.requestId == this.requestId

core/java/android/net/DhcpResults.java

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public final class DhcpResults implements Parcelable { 
    }



    @Override

    public boolean equals(Object obj) {

    public boolean equals(@Nullable Object obj) {

        if (this == obj) return true;



        if (!(obj instanceof DhcpResults)) return false;

core/java/android/net/Ikev2VpnProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { 
    }



    @Override

    public boolean equals(Object obj) {

    public boolean equals(@Nullable Object obj) {

        if (!(obj instanceof Ikev2VpnProfile)) {

            return false;

        }

core/java/android/net/IpSecTransform.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static android.net.IpSecManager.INVALID_RESOURCE_ID; 


import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresFeature;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;
@@ -150,7 +151,7 @@ public final class IpSecTransform implements AutoCloseable { 
    /**

     * Standard equals.

     */

    public boolean equals(Object other) {

    public boolean equals(@Nullable Object other) {

        if (this == other) return true;

        if (!(other instanceof IpSecTransform)) return false;

        final IpSecTransform rhs = (IpSecTransform) other;

core/java/android/net/MatchAllNetworkSpecifier.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.net;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -44,7 +45,7 @@ public final class MatchAllNetworkSpecifier extends NetworkSpecifier implements 
    }



    @Override

    public boolean equals(Object o) {

    public boolean equals(@Nullable Object o) {

        return o instanceof MatchAllNetworkSpecifier;

    }