Merge "Pass emergency session information to modem" into 24D1-dev (d4f04830) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/satellite/stub/ISatellite.aidl

+4 −1

Original line number	Diff line number	Diff line
		@@ -83,6 +83,9 @@ oneway interface ISatellite {
		*
		* @param enableSatellite True to enable the satellite modem and false to disable.
		* @param enableDemoMode True to enable demo mode and false to disable.
		* @param isEmergency To specify the satellite is enabled for emergency session and false for
		* non emergency session. Note: it is possible that a emergency session started get converted
		* to a non emergency session and vice versa.
		* @param resultCallback The callback to receive the error code result of the operation.
		*
		* Valid result codes returned:
		@@ -96,7 +99,7 @@ oneway interface ISatellite {
		* SatelliteResult:SATELLITE_RESULT_NO_RESOURCES
		*/
		void requestSatelliteEnabled(in boolean enableSatellite, in boolean enableDemoMode,
		in IIntegerConsumer resultCallback);
		in boolean isEmergency, in IIntegerConsumer resultCallback);

		/**
		* Request to get whether the satellite modem is enabled.

+6 −3

Original line number	Diff line number	Diff line
		@@ -90,11 +90,11 @@ public class SatelliteImplBase extends SatelliteService {

		@Override
		public void requestSatelliteEnabled(boolean enableSatellite, boolean enableDemoMode,
		IIntegerConsumer resultCallback) throws RemoteException {
		boolean isEmergency, IIntegerConsumer resultCallback) throws RemoteException {
		executeMethodAsync(
		() -> SatelliteImplBase.this
		.requestSatelliteEnabled(
		enableSatellite, enableDemoMode, resultCallback),
		enableSatellite, enableDemoMode, isEmergency, resultCallback),
		"requestSatelliteEnabled");
		}

		@@ -337,6 +337,9 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* @param enableSatellite True to enable the satellite modem and false to disable.
		* @param enableDemoMode True to enable demo mode and false to disable.
		* @param isEmergency To specify the satellite is enabled for emergency session and false for
		* non emergency session. Note: it is possible that a emergency session started get converted
		* to a non emergency session and vice versa.
		* @param resultCallback The callback to receive the error code result of the operation.
		*
		* Valid result codes returned:
		@@ -350,7 +353,7 @@ public class SatelliteImplBase extends SatelliteService {
		* SatelliteResult:SATELLITE_RESULT_NO_RESOURCES
		*/
		public void requestSatelliteEnabled(boolean enableSatellite, boolean enableDemoMode,
		@NonNull IIntegerConsumer resultCallback) {
		boolean isEmergency, @NonNull IIntegerConsumer resultCallback) {
		// stub implementation
		}