Merge "Improve equals method of NetworkScanRequest" (e9b15850) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/NetworkScanRequest.java

+11 −13

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,8 @@
	package android.telephony;		package android.telephony;

	import android.annotation.IntDef;		import android.annotation.IntDef;
			import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;

	@@ -24,6 +26,7 @@ import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Arrays;		import java.util.Arrays;
			import java.util.Objects;

	/**		/**
	* Defines a request to perform a network scan.		* Defines a request to perform a network scan.
	@@ -108,6 +111,7 @@ public final class NetworkScanRequest implements Parcelable {
	private int mIncrementalResultsPeriodicity;		private int mIncrementalResultsPeriodicity;

	/** Describes the radio access technologies with bands or channels that need to be scanned. */		/** Describes the radio access technologies with bands or channels that need to be scanned. */
			@Nullable
	private RadioAccessSpecifier[] mSpecifiers;		private RadioAccessSpecifier[] mSpecifiers;

	/**		/**
	@@ -117,6 +121,7 @@ public final class NetworkScanRequest implements Parcelable {
	* If list not sent, search to be completed till end and all PLMNs found to be reported.		* If list not sent, search to be completed till end and all PLMNs found to be reported.
	* Max size of array is MAX_MCC_MNC_LIST_SIZE		* Max size of array is MAX_MCC_MNC_LIST_SIZE
	*/		*/
			@NonNull
	private ArrayList<String> mMccMncs;		private ArrayList<String> mMccMncs;

	/**		/**
	@@ -240,27 +245,20 @@ public final class NetworkScanRequest implements Parcelable {
	}		}

	@Override		@Override
	public boolean equals (Object o) {		public boolean equals(Object other) {
	NetworkScanRequest nsr;		if (this == other) return true;

	try {		if (!(other instanceof NetworkScanRequest)) return false;
	nsr = (NetworkScanRequest) o;
	} catch (ClassCastException ex) {
	return false;
	}

	if (o == null) {		NetworkScanRequest nsr = (NetworkScanRequest) other;
	return false;
	}

	return (mScanType == nsr.mScanType		return mScanType == nsr.mScanType
	&& Arrays.equals(mSpecifiers, nsr.mSpecifiers)		&& Arrays.equals(mSpecifiers, nsr.mSpecifiers)
	&& mSearchPeriodicity == nsr.mSearchPeriodicity		&& mSearchPeriodicity == nsr.mSearchPeriodicity
	&& mMaxSearchTime == nsr.mMaxSearchTime		&& mMaxSearchTime == nsr.mMaxSearchTime
	&& mIncrementalResults == nsr.mIncrementalResults		&& mIncrementalResults == nsr.mIncrementalResults
	&& mIncrementalResultsPeriodicity == nsr.mIncrementalResultsPeriodicity		&& mIncrementalResultsPeriodicity == nsr.mIncrementalResultsPeriodicity
	&& (((mMccMncs != null)		&& Objects.equals(mMccMncs, nsr.mMccMncs);
	&& mMccMncs.equals(nsr.mMccMncs))));
	}		}

	@Override		@Override