Merge "Remove Duplicate Override for Operator Alphas" am: 24eaa6ab3d

am: f5f908c525

Change-Id: I9fe744ec118df8e68616d72f2c26db612b2b49a0

telephony/java/android/telephony/CellIdentityTdscdma.java

@@ -16,7 +16,6 @@
 
 package android.telephony;
 
-import android.annotation.Nullable;
 import android.os.Parcel;
 
 import java.util.Objects;
@@ -135,28 +134,6 @@ public final class CellIdentityTdscdma extends CellIdentity {
         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
     public boolean equals(Object other) {
         if (this == other) {