Merge "Remove Duplicate Override for Operator Alphas" am: 24eaa6ab3d (fe1b6deb) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CellIdentityTdscdma.java

+0 −23

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	package android.telephony;		package android.telephony;

	import android.annotation.Nullable;
	import android.os.Parcel;		import android.os.Parcel;

	import java.util.Objects;		import java.util.Objects;
	@@ -135,28 +134,6 @@ public final class CellIdentityTdscdma extends CellIdentity {
	return mUarfcn;		return mUarfcn;
	}		}

	/**
	* @return The long alpha tag associated with the current scan result (may be the operator
	* name string or extended operator name string). May be null if unknown.
	*
	* @hide
	*/
	@Nullable
	public CharSequence getOperatorAlphaLong() {
	return mAlphaLong;
	}

	/**
	* @return The short alpha tag associated with the current scan result (may be the operator
	* name string or extended operator name string). May be null if unknown.
	*
	* @hide
	*/
	@Nullable
	public CharSequence getOperatorAlphaShort() {
	return mAlphaShort;
	}

	@Override		@Override
	public boolean equals(Object other) {		public boolean equals(Object other) {
	if (this == other) {		if (this == other) {