Snap for 6875707 from 41c1360539483a417f166e3a785be961416e2a8a to rvc-qpr1-release (afc29894) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ServiceStateTracker.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -3414,15 +3414,15 @@ public class ServiceStateTracker extends Handler {
		}
		}

		if (hasCssIndicatorChanged) {
		mPhone.notifyAllActiveDataConnections();
		}

		mReasonDataDenied = mNewReasonDataDenied;
		mMaxDataCalls = mNewMaxDataCalls;
		mRejectCode = mNewRejectCode;
		}

		if (hasCssIndicatorChanged) {
		mPhone.notifyAllActiveDataConnections();
		}

		ServiceState oldMergedSS = new ServiceState(mPhone.getServiceState());

		// swap mSS and mNewSS to put new state in mSS

+4 −3

Original line number	Diff line number	Diff line
		@@ -2030,7 +2030,7 @@ public class DcTracker extends Handler {
		// this type.
		if (!apnContext.getApnType().equals(PhoneConstants.APN_TYPE_DUN)
		\|\| ServiceState.isGsm(getDataRat())) {
		dataConnection = checkForCompatibleDataConnection(apnContext);
		dataConnection = checkForCompatibleDataConnection(apnContext, apnSetting);
		if (dataConnection != null) {
		// Get the apn setting used by the data connection
		ApnSetting dataConnectionApnSetting = dataConnection.getApnSetting();
		@@ -2441,7 +2441,8 @@ public class DcTracker extends Handler {
		}
		}

		private DataConnection checkForCompatibleDataConnection(ApnContext apnContext) {
		private DataConnection checkForCompatibleDataConnection(ApnContext apnContext,
		ApnSetting nextApn) {
		int apnType = apnContext.getApnTypeBitmask();
		ArrayList<ApnSetting> dunSettings = null;

		@@ -2480,7 +2481,7 @@ public class DcTracker extends Handler {
		+ " found canHandle conn=" + curDc);
		}
		return curDc;
		} else if (curDc.isActivating()) {
		} else if (curDc.isActivating() \|\| apnSetting.equals(nextApn)) {
		potentialDc = curDc;
		}
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -2882,9 +2882,16 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		}

		String callId = imsCall.getSession().getCallId();
		EmergencyNumberTracker emergencyNumberTracker = conn.getEmergencyNumberTracker();
		EmergencyNumberTracker emergencyNumberTracker = null;
		EmergencyNumber num = null;

		if (conn != null) {
		emergencyNumberTracker = conn.getEmergencyNumberTracker();
		num = conn.getEmergencyNumberInfo();
		}

		mMetrics.writeOnImsCallTerminated(mPhone.getPhoneId(), imsCall.getCallSession(),
		reasonInfo, mCallQualityMetrics.get(callId), conn.getEmergencyNumberInfo(),
		reasonInfo, mCallQualityMetrics.get(callId), num,
		getNetworkCountryIso(), emergencyNumberTracker != null
		? emergencyNumberTracker.getEmergencyNumberDbVersion()
		: TelephonyManager.INVALID_EMERGENCY_NUMBER_DB_VERSION);