Snap for 8492870 from c115d0746d240bac985773b9e059832b6e9be090 to tm-d1-release (1ad314f7) · Commits · e / os / android_frameworks_opt_telephony

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

+14 −8

Original line number	Diff line number	Diff line
		@@ -1948,15 +1948,22 @@ public class ServiceStateTracker extends Handler {
		err = ((CommandException)(ar.exception)).getCommandError();
		}

		if (mCi.getRadioState() != TelephonyManager.RADIO_POWER_ON) {
		log("handlePollStateResult: Invalid response due to radio off or unavailable. "
		+ "Set ServiceState to out of service.");
		pollStateInternal(false);
		return;
		}

		if (err == CommandException.Error.RADIO_NOT_AVAILABLE) {
		// Radio has crashed or turned off
		loge("handlePollStateResult: RIL returned RADIO_NOT_AVAILABLE when radio is on.");
		cancelPollState();
		return;
		}

		if (err != CommandException.Error.OP_NOT_ALLOWED_BEFORE_REG_NW) {
		loge("RIL implementation has returned an error where it must succeed" +
		ar.exception);
		loge("handlePollStateResult: RIL returned an error where it must succeed: "
		+ ar.exception);
		}
		} else try {
		handlePollStateResultMessage(what, ar);
		@@ -3328,10 +3335,9 @@ public class ServiceStateTracker extends Handler {

		private void pollStateInternal(boolean modemTriggered) {
		mPollingContext = new int[1];
		mPollingContext[0] = 0;
		NetworkRegistrationInfo nri;

		log("pollState: modemTriggered=" + modemTriggered);
		log("pollState: modemTriggered=" + modemTriggered + ", radioState=" + mCi.getRadioState());

		switch (mCi.getRadioState()) {
		case TelephonyManager.RADIO_POWER_UNAVAILABLE:
		@@ -3365,8 +3371,8 @@ public class ServiceStateTracker extends Handler {
		mPhone.getSignalStrengthController().setSignalStrengthDefaultValues();
		mLastNitzData = null;
		mNitzState.handleNetworkUnavailable();
		// don't poll when device is shutting down or the poll was not modemTrigged
		// (they sent us new radio data) and current network is not IWLAN
		// Don't poll when device is shutting down or the poll was not modemTriggered
		// (they sent us new radio data) and the current network is not IWLAN
		if (mDeviceShuttingDown \|\|
		(!modemTriggered && ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN
		!= mSS.getRilDataRadioTechnology())) {

src/java/com/android/internal/telephony/data/DataNetwork.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1873,6 +1873,8 @@ public class DataNetwork extends StateMachine {
		removeUnsatisfiedNetworkRequests();
		mDataNetworkCallback.invokeFromExecutor(() -> mDataNetworkCallback
		.onNetworkCapabilitiesChanged(DataNetwork.this));
		} else {
		log("updateNetworkCapabilities: Capabilities not changed.");
		}
		}

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -3259,12 +3259,16 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {

		} else if (conn.isIncoming() && conn.getConnectTime() == 0
		&& cause != DisconnectCause.ANSWERED_ELSEWHERE) {
		// Missed
		if (cause == DisconnectCause.NORMAL
		\|\| cause == DisconnectCause.INCOMING_AUTO_REJECTED) {
		cause = DisconnectCause.INCOMING_MISSED;
		} else {

		if (conn.getDisconnectCause() == DisconnectCause.LOCAL) {
		// If the user initiated a disconnect of this connection, then we will treat
		// this is a rejected call.
		// Note; the record the fact that this is a local disconnect in
		// ImsPhoneConnection#onHangupLocal
		cause = DisconnectCause.INCOMING_REJECTED;
		} else {
		// Otherwise in all other cases consider it missed.
		cause = DisconnectCause.INCOMING_MISSED;
		}
		if (DBG) log("Incoming connection of 0 connect time detected - translated " +
		"cause = " + cause);

src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -542,8 +542,7 @@ public class ImsPhoneConnection extends Connection implements
		/**
		* Called when this Connection is being hung up locally (eg, user pressed "end")
		*/
		void
		onHangupLocal() {
		public void onHangupLocal() {
		mCause = DisconnectCause.LOCAL;
		}

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1143,7 +1143,7 @@ public class DataNetworkTest extends TelephonyTest {
		assertThat(mDataNetworkUT.getNetworkCapabilities().hasCapability(
		NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)).isFalse();

		doReturn(Set.of(TelephonyManager.NETWORK_TYPE_LTE)).when(mDataNetworkController)
		doReturn(Set.of(TelephonyManager.NETWORK_TYPE_UMTS)).when(mDataNetworkController)
		.getUnmeteredOverrideNetworkTypes();
		mDataNetworkUT.sendMessage(1/EVENT_DATA_CONFIG_UPDATED/);