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

Commit f5f908c5 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Remove Duplicate Override for Operator Alphas"

am: 24eaa6ab

Change-Id: I15004a7df3d922ba50d187769299723e888febae
parents e5c77fc9 24eaa6ab
Loading
Loading
Loading
Loading
+0 −23
Original line number Diff line number Diff line
@@ -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) {