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

Commit 5a7ce86b authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs",... 

Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id" am: 24f4fce2 am: 61fa631c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438018

Change-Id: I048a1dbdc951cee04b48fdc4fb08de83b596a7ab
parents f35a5d5a 61fa631c

services/core/java/com/android/server/TelephonyRegistry.java

+2 −0
Original line number Diff line number Diff line
@@ -1743,6 +1743,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                        preciseState.getApnSetting());

                PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId)

                        .remove(key);

                log("Jack: oldState=" + oldState);

                log("Jack: newState=" + preciseState);

                if (!Objects.equals(oldState, preciseState)) {

                    for (Record r : mRecords) {

                        if (r.matchPhoneStateListenerEvent(

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

+9 −5
Original line number Diff line number Diff line
@@ -1214,12 +1214,16 @@ public class ApnSetting implements Parcelable { 
        return false;

    }



    // TODO - if we have this function we should also have hashCode.

    // Also should handle changes in type order and perhaps case-insensitivity.

    @Override

    public int hashCode() {

        return Objects.hash(mApnName, mProxyAddress, mProxyPort, mMmsc, mMmsProxyAddress,

                mMmsProxyPort, mUser, mPassword, mAuthType, mApnTypeBitmask, mId, mOperatorNumeric,

                mProtocol, mRoamingProtocol, mMtu, mCarrierEnabled, mNetworkTypeBitmask, mProfileId,

                mPersistent, mMaxConns, mWaitTime, mMaxConnsTime, mMvnoType, mMvnoMatchData,

                mApnSetId, mCarrierId, mSkip464Xlat);

    }



    /**

     * @hide

     */

    @Override

    public boolean equals(Object o) {

        if (o instanceof ApnSetting == false) {

            return false;