Snap for 10071751 from 3f053a6cfc0072db4f756bc3574e317d85459fdc to udc-qpr1-release (d96fae29) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -2989,6 +2989,13 @@ public interface CommandsInterface {
		*/
		default void setNullCipherAndIntegrityEnabled(boolean enabled, Message result) {}

		/**
		* Check whether null ciphering and/or null integrity-protected connections are allowed.
		*
		* @param result Callback message containing the success or failure status.
		*/
		default void isNullCipherAndIntegrityEnabled(Message result) {}

		/**
		* Notifies the IMS call status to the modem.
		*

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

+35 −0

Original line number	Diff line number	Diff line
		@@ -5669,6 +5669,41 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}
		}

		/**
		* Get if null ciphering / null integrity are enabled / disabled.
		*
		* @param result Callback message containing the success or failure status.
		*/
		@Override
		public void isNullCipherAndIntegrityEnabled(Message result) {
		RadioNetworkProxy networkProxy = getRadioServiceProxy(RadioNetworkProxy.class, result);
		if (networkProxy.isEmpty()) return;
		if (mHalVersion.get(HAL_SERVICE_NETWORK).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {
		RILRequest rr = obtainRequest(RIL_REQUEST_IS_NULL_CIPHER_AND_INTEGRITY_ENABLED, result,
		mRILDefaultWorkSource);

		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + RILUtils.requestToString(rr.mRequest));
		}

		try {
		networkProxy.isNullCipherAndIntegrityEnabled(rr.mSerial);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(
		HAL_SERVICE_NETWORK, "isNullCipherAndIntegrityEnabled", e);
		}
		} else {
		if (RILJ_LOGD) {
		Rlog.d(RILJ_LOG_TAG, "isNullCipherAndIntegrityEnabled: REQUEST_NOT_SUPPORTED");
		}
		if (result != null) {
		AsyncResult.forMessage(result, null,
		CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
		result.sendToTarget();
		}
		}
		}

		/**
		* {@inheritDoc}
		*/

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ import static com.android.internal.telephony.RILConstants.RIL_REQUEST_IMS_SEND_S
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_ISIM_AUTHENTICATION;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_IS_N1_MODE_ENABLED;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_IS_NR_DUAL_CONNECTIVITY_ENABLED;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_IS_NULL_CIPHER_AND_INTEGRITY_ENABLED;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_IS_VONR_ENABLED;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_LAST_CALL_FAIL_CAUSE;
		import static com.android.internal.telephony.RILConstants.RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE;
		@@ -5347,6 +5348,8 @@ public class RILUtils {
		return "TRIGGER_EPS_FALLBACK";
		case RIL_REQUEST_SET_NULL_CIPHER_AND_INTEGRITY_ENABLED:
		return "SET_NULL_CIPHER_AND_INTEGRITY_ENABLED";
		case RIL_REQUEST_IS_NULL_CIPHER_AND_INTEGRITY_ENABLED:
		return "IS_NULL_CIPHER_AND_INTEGRITY_ENABLED";
		case RIL_REQUEST_UPDATE_IMS_CALL_STATUS:
		return "UPDATE_IMS_CALL_STATUS";
		case RIL_REQUEST_SET_N1_MODE_ENABLED:

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

+13 −4

Original line number	Diff line number	Diff line
		@@ -1340,13 +1340,14 @@ public class DataNetwork extends StateMachine {
		}
		}

		// If we've ever received PCO data before connected, now it's the time to
		// process it.
		// If we've ever received PCO data before connected, now it's the time to process it.
		mPcoData.getOrDefault(mCid.get(mTransport), Collections.emptyMap())
		.forEach((pcoId, pcoData) -> {
		onPcoDataChanged(pcoData);
		});

		mDataNetworkCallback.invokeFromExecutor(
		() -> mDataNetworkCallback.onLinkStatusChanged(DataNetwork.this, mLinkStatus));
		notifyPreciseDataConnectionState();
		updateSuspendState();
		}
		@@ -1598,6 +1599,9 @@ public class DataNetwork extends StateMachine {
		//************************************************************//

		if (mEverConnected) {
		mLinkStatus = DataCallResponse.LINK_STATUS_INACTIVE;
		mDataNetworkCallback.invokeFromExecutor(() -> mDataNetworkCallback
		.onLinkStatusChanged(DataNetwork.this, mLinkStatus));
		mDataNetworkCallback.invokeFromExecutor(() -> mDataNetworkCallback
		.onDisconnected(DataNetwork.this, mFailCause, mTearDownReason));
		if (mTransport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN) {
		@@ -2302,8 +2306,13 @@ public class DataNetwork extends StateMachine {
		if (mLinkStatus != response.getLinkStatus()) {
		mLinkStatus = response.getLinkStatus();
		log("Link status updated to " + DataUtils.linkStatusToString(mLinkStatus));
		mDataNetworkCallback.invokeFromExecutor(
		() -> mDataNetworkCallback.onLinkStatusChanged(DataNetwork.this, mLinkStatus));
		if (isConnected()) {
		// If the data network is in a transition state, the link status will be notified
		// upon entering connected or disconnected state. If the data network is already
		// connected, send the updated link status from the updated data call response.
		mDataNetworkCallback.invokeFromExecutor(() -> mDataNetworkCallback
		.onLinkStatusChanged(DataNetwork.this, mLinkStatus));
		}
		}

		// Set link addresses

src/java/com/android/internal/telephony/satellite/DatagramController.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ public class DatagramController {
		* @param pointingAppController PointingAppController is used to update PointingApp
		* about datagram transfer state changes.
		*/
		@VisibleForTesting
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
		protected DatagramController(@NonNull Context context, @NonNull Looper looper,
		@NonNull PointingAppController pointingAppController) {
		mContext = context;
		@@ -264,7 +264,8 @@ public class DatagramController {
		* Set variables for {@link DatagramDispatcher} and {@link DatagramReceiver} to run demo mode
		* @param isDemoMode {@code true} means demo mode is on, {@code false} otherwise.
		*/
		void setDemoMode(boolean isDemoMode) {
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public void setDemoMode(boolean isDemoMode) {
		mIsDemoMode = isDemoMode;
		mDatagramDispatcher.setDemoMode(isDemoMode);
		mDatagramReceiver.setDemoMode(isDemoMode);
		@@ -275,7 +276,7 @@ public class DatagramController {
		}

		/** Get the last sent datagram for demo mode */
		@VisibleForTesting
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
		public SatelliteDatagram getDemoModeDatagram() {
		return mDemoModeDatagram;
		}
		@@ -285,7 +286,7 @@ public class DatagramController {
		* @param datagramType datagram type, only DATAGRAM_TYPE_SOS_MESSAGE will be saved
		* @param datagram datagram The last datagram saved when sendSatelliteDatagramForDemo is called
		*/
		@VisibleForTesting
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
		protected void setDemoModeDatagram(@SatelliteManager.DatagramType int datagramType,
		SatelliteDatagram datagram) {
		if (mIsDemoMode && datagramType == SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE) {