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

Commit 009bbbf6 authored by yifan.bai's avatar yifan.bai Committed by android-build-merger
Browse files

Merge "Fix oldMergedSS is altered to OUT_OF_SERVICE." am: 29664b82 am: a9598c6f 

am: 92cfc4a1

Change-Id: I154fccf2ee1046de3b4ec2c0e628114371d7fb45
parents d4fa4586 92cfc4a1

telephony/java/android/telephony/ServiceState.java

+7 −3
Original line number Diff line number Diff line
@@ -353,9 +353,11 @@ public class ServiceState implements Parcelable { 
        mIsDataRoamingFromRegistration = s.mIsDataRoamingFromRegistration;

        mIsUsingCarrierAggregation = s.mIsUsingCarrierAggregation;

        mChannelNumber = s.mChannelNumber;

        mCellBandwidths = Arrays.copyOf(s.mCellBandwidths, s.mCellBandwidths.length);

        mCellBandwidths = s.mCellBandwidths == null ? null :

                Arrays.copyOf(s.mCellBandwidths, s.mCellBandwidths.length);

        mLteEarfcnRsrpBoost = s.mLteEarfcnRsrpBoost;

        mNetworkRegistrationStates = new ArrayList<>(s.mNetworkRegistrationStates);

        mNetworkRegistrationStates = s.mNetworkRegistrationStates == null ? null :

                new ArrayList<>(s.mNetworkRegistrationStates);

    }



    /**
@@ -812,7 +814,9 @@ public class ServiceState implements Parcelable { 
                && mIsEmergencyOnly == s.mIsEmergencyOnly

                && mIsDataRoamingFromRegistration == s.mIsDataRoamingFromRegistration

                && mIsUsingCarrierAggregation == s.mIsUsingCarrierAggregation)

                && mNetworkRegistrationStates.containsAll(s.mNetworkRegistrationStates);

                && (mNetworkRegistrationStates == null ? s.mNetworkRegistrationStates == null :

                        s.mNetworkRegistrationStates != null &&

                        mNetworkRegistrationStates.containsAll(s.mNetworkRegistrationStates));

    }



    /**