Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix oldMergedSS is altered to OUT_OF_SERVICE." am: 29664b8206 am: a9598c6f6c

Browse Source 
am: 92cfc4a192

Change-Id: I154fccf2ee1046de3b4ec2c0e628114371d7fb45
This commit is contained in:
yifan.bai
2018-08-31 19:41:49 -07:00
committed by android-build-merger
parent d4fa45862d 92cfc4a192
commit 009bbbf62d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/ServiceState.java
View File

@@ -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));
}
/**