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

Commit dc0f4bd4 authored by Ling Ma's avatar Ling Ma Committed by Jack Yu
Browse files

Merge similar data profile - ignore gid difference 

Fix: 240225494
Test: atest
Merged-In: Id203a3ba71adb3783edcf2c1e1f885c129e9328a
Change-Id: Id203a3ba71adb3783edcf2c1e1f885c129e9328a
parent e073b7ed

telephony/java/android/telephony/data/ApnSetting.java

+1 −2
Original line number Diff line number Diff line
@@ -1109,6 +1109,7 @@ public class ApnSetting implements Parcelable { 
        sb.append(", ").append(mCarrierId);

        sb.append(", ").append(mSkip464Xlat);

        sb.append(", ").append(mAlwaysOn);

        sb.append(", ").append(Objects.hash(mUser, mPassword));

        return sb.toString();

    }
@@ -1297,8 +1298,6 @@ public class ApnSetting implements Parcelable { 
                other.mLingeringNetworkTypeBitmask)

                && Objects.equals(this.mProfileId, other.mProfileId)

                && Objects.equals(this.mPersistent, other.mPersistent)

                && Objects.equals(this.mMvnoType, other.mMvnoType)

                && Objects.equals(this.mMvnoMatchData, other.mMvnoMatchData)

                && Objects.equals(this.mApnSetId, other.mApnSetId)

                && Objects.equals(this.mCarrierId, other.mCarrierId)

                && Objects.equals(this.mSkip464Xlat, other.mSkip464Xlat)