Merge "Remove sim slot input param from satellite HAL APIs." into main (b5c61406) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -5422,7 +5422,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		rr,
		"setSatellitePlmn",
		() -> {
		networkProxy.setSatellitePlmn(rr.mSerial, simSlot, carrierPlmnList,
		networkProxy.setSatellitePlmn(rr.mSerial, carrierPlmnList,
		allSatellitePlmnList);
		});
		}
		@@ -5454,8 +5454,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		rr,
		"setSatelliteEnabledForCarrier",
		() -> {
		networkProxy.setSatelliteEnabledForCarrier(rr.mSerial, simSlot,
		satelliteEnabled);
		networkProxy.setSatelliteEnabledForCarrier(rr.mSerial, satelliteEnabled);
		});
		}

		@@ -5482,7 +5481,7 @@ public class RIL extends BaseCommands implements CommandsInterface {

		radioServiceInvokeHelper(
		HAL_SERVICE_NETWORK, rr, "isSatelliteEnabledForCarrier", () -> {
		networkProxy.isSatelliteEnabledForCarrier(rr.mSerial, simSlot);
		networkProxy.isSatelliteEnabledForCarrier(rr.mSerial);
		});
		}

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

+7 −13

Original line number	Diff line number	Diff line
		@@ -992,22 +992,19 @@ public class RadioNetworkProxy extends RadioServiceProxy {
		* Set the non-terrestrial PLMN with lower priority than terrestrial networks.
		*
		* @param serial Serial number of request.
		* @param simSlot Indicates the SIM slot to which this API will be applied. The modem will use
		* this information to determine the relevant carrier.
		* @param carrierPlmnList The list of roaming PLMN used for connecting to satellite networks
		* supported by user subscription.
		* @param allSatellitePlmnList Modem should use the allSatellitePlmnList to identify satellite
		* PLMNs that are not supported by the carrier and make sure not to
		* attach to them.
		*/
		public void setSatellitePlmn(int serial, int simSlot, List<String> carrierPlmnList,
		public void setSatellitePlmn(int serial, List<String> carrierPlmnList,
		List<String> allSatellitePlmnList) throws RemoteException {
		if (isEmpty()) return;
		if (isAidl()) {
		String[] carrierPlmnArray = carrierPlmnList.toArray(new String[0]);
		String[] allSatellitePlmnArray = allSatellitePlmnList.toArray(new String[0]);
		mNetworkProxy.setSatellitePlmn(serial, simSlot, carrierPlmnArray,
		allSatellitePlmnArray);
		mNetworkProxy.setSatellitePlmn(serial, carrierPlmnArray, allSatellitePlmnArray);
		}
		// Only supported on AIDL.
		}
		@@ -1016,15 +1013,13 @@ public class RadioNetworkProxy extends RadioServiceProxy {
		* Enable or disable satellite in the cellular modem associated with a carrier.
		*
		* @param serial Serial number of request.
		* @param simSlot Indicates the SIM slot to which this API will be applied. The modem will use
		* this information to determine the relevant carrier.
		* @param satelliteEnabled {@code true} to enable satellite, {@code false} to disable satellite.
		*/
		public void setSatelliteEnabledForCarrier(int serial, int simSlot,
		boolean satelliteEnabled) throws RemoteException {
		public void setSatelliteEnabledForCarrier(
		int serial, boolean satelliteEnabled) throws RemoteException {
		if (isEmpty()) return;
		if (isAidl()) {
		mNetworkProxy.setSatelliteEnabledForCarrier(serial, simSlot, satelliteEnabled);
		mNetworkProxy.setSatelliteEnabledForCarrier(serial, satelliteEnabled);
		}
		// Only supported on AIDL.
		}
		@@ -1033,13 +1028,12 @@ public class RadioNetworkProxy extends RadioServiceProxy {
		* Check whether satellite is enabled in the cellular modem associated with a carrier.
		*
		* @param serial Serial number of request.
		* @param simSlot Indicates the SIM slot to which this API will be applied.
		*/
		public void isSatelliteEnabledForCarrier(int serial, int simSlot)
		public void isSatelliteEnabledForCarrier(int serial)
		throws RemoteException {
		if (isEmpty()) return;
		if (isAidl()) {
		mNetworkProxy.isSatelliteEnabledForCarrier(serial, simSlot);
		mNetworkProxy.isSatelliteEnabledForCarrier(serial);
		}
		// Only supported on AIDL.
		}