Merge "Update API for satellite service" (736189e9) · Commits · e / os / android_frameworks_base

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

+31 −8

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.telephony.satellite.stub;

		import android.telephony.satellite.stub.ISatelliteCapabilitiesConsumer;
		import android.telephony.satellite.stub.ISatelliteListener;
		import android.telephony.satellite.stub.ISatelliteModemStateConsumer;
		import android.telephony.satellite.stub.SatelliteDatagram;

		import com.android.internal.telephony.IBooleanConsumer;
		@@ -36,6 +35,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -54,6 +54,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -64,15 +65,16 @@ oneway interface ISatellite {
		void setSatelliteListeningEnabled(in boolean enable, in IIntegerConsumer errorCallback);

		/**
		* Enable or disable the satellite modem. If the satellite modem is enabled, this will also
		* disable the cellular modem, and if the satellite modem is disabled, this will also re-enable
		* the cellular modem.
		* Request to enable or disable the satellite modem. If the satellite modem is enabled,
		* this will also disable the cellular modem, and if the satellite modem is disabled,
		* this will also re-enable the cellular modem.
		*
		* @param enable True to enable the satellite modem and false to disable.
		* @param errorCallback The callback to receive the error code result of the operation.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -80,17 +82,19 @@ oneway interface ISatellite {
		* SatelliteError:REQUEST_NOT_SUPPORTED
		* SatelliteError:NO_RESOURCES
		*/
		void setSatelliteEnabled(in boolean enabled, in IIntegerConsumer errorCallback);
		void requestSatelliteEnabled(in boolean enabled, in IIntegerConsumer errorCallback);

		/**
		* Request to get whether the satellite modem is enabled.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether the satellite modem is enabled.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -104,11 +108,13 @@ oneway interface ISatellite {
		* Request to get whether the satellite service is supported on the device.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether the satellite service is supported on the device.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -123,11 +129,13 @@ oneway interface ISatellite {
		* Request to get the SatelliteCapabilities of the satellite service.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the SatelliteCapabilities of the satellite service.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -147,6 +155,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -164,6 +173,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -177,11 +187,13 @@ oneway interface ISatellite {
		* Request to get the maximum number of characters per MO text message on satellite.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the maximum number of characters per MO text message on satellite.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -203,6 +215,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -225,6 +238,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -240,13 +254,14 @@ oneway interface ISatellite {
		/**
		* Request to get whether this device is provisioned with a satellite provider.
		*
		* @param token The token of the device/subscription to be deprovisioned.
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether this device is provisioned with a satellite provider.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -254,7 +269,7 @@ oneway interface ISatellite {
		* SatelliteError:REQUEST_NOT_SUPPORTED
		* SatelliteError:NO_RESOURCES
		*/
		void requestIsSatelliteProvisioned(in String token, in IIntegerConsumer errorCallback,
		void requestIsSatelliteProvisioned(in IIntegerConsumer errorCallback,
		in IBooleanConsumer callback);

		/**
		@@ -266,6 +281,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -291,6 +307,7 @@ oneway interface ISatellite {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -313,11 +330,13 @@ oneway interface ISatellite {
		* ISatelliteListener#onSatelliteModemStateChanged.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the current satellite modem state.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -326,17 +345,19 @@ oneway interface ISatellite {
		* SatelliteError:NO_RESOURCES
		*/
		void requestSatelliteModemState(in IIntegerConsumer errorCallback,
		in ISatelliteModemStateConsumer callback);
		in IIntegerConsumer callback);

		/**
		* Request to get whether satellite communication is allowed for the current location.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether satellite communication is allowed for the current location.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -353,11 +374,13 @@ oneway interface ISatellite {
		* This will return 0 if the satellite is currently visible.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the time after which the satellite will be visible.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS

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

deleted100644 → 0

+0 −27

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.telephony.satellite.stub;

		import android.telephony.satellite.stub.SatelliteModemState;

		/**
		* Consumer pattern for a request that receives a SatelliteModemState from the SatelliteService.
		* @hide
		*/
		oneway interface ISatelliteModemStateConsumer {
		void accept(in SatelliteModemState result);
		}

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

+14 −14

Original line number	Diff line number	Diff line
		@@ -32,60 +32,60 @@ enum SatelliteError {
		/**
		* Error received from the satellite server.
		*/
		SATELLITE_SERVER_ERROR = 2,
		SERVER_ERROR = 2,
		/**
		* Error received from the vendor service. This generic error code should be used
		* only when the error cannot be mapped to other specific service error codes.
		*/
		SATELLITE_SERVICE_ERROR = 3,
		SERVICE_ERROR = 3,
		/**
		* Error received from satellite modem. This generic error code should be used only when
		* the error cannot be mapped to other specific modem error codes.
		*/
		SATELLITE_MODEM_ERROR = 4,
		MODEM_ERROR = 4,
		/**
		* Error received from the satellite network. This generic error code should be used only when
		* the error cannot be mapped to other specific network error codes.
		*/
		SATELLITE_NETWORK_ERROR = 5,
		NETWORK_ERROR = 5,
		/**
		* Telephony is not in a valid state to receive requests from clients.
		*/
		SATELLITE_INVALID_TELEPHONY_STATE = 6,
		INVALID_TELEPHONY_STATE = 6,
		/**
		* Satellite modem is not in a valid state to receive requests from clients.
		*/
		SATELLITE_INVALID_MODEM_STATE = 7,
		INVALID_MODEM_STATE = 7,
		/**
		* Either vendor service, or modem, or Telephony framework has received a request with
		* invalid arguments from its clients.
		*/
		SATELLITE_INVALID_ARGUMENTS = 8,
		INVALID_ARGUMENTS = 8,
		/**
		* Telephony framework failed to send a request or receive a response from the vendor service
		* or satellite modem due to internal error.
		*/
		SATELLITE_REQUEST_FAILED = 9,
		REQUEST_FAILED = 9,
		/**
		* Radio did not start or is resetting.
		*/
		SATELLITE_RADIO_NOT_AVAILABLE = 10,
		RADIO_NOT_AVAILABLE = 10,
		/**
		* The request is not supported by either the satellite modem or the network.
		*/
		SATELLITE_REQUEST_NOT_SUPPORTED = 11,
		REQUEST_NOT_SUPPORTED = 11,
		/**
		* Satellite modem or network has no resources available to handle requests from clients.
		*/
		SATELLITE_NO_RESOURCES = 12,
		NO_RESOURCES = 12,
		/**
		* Satellite service is not provisioned yet.
		*/
		SATELLITE_SERVICE_NOT_PROVISIONED = 13,
		SERVICE_NOT_PROVISIONED = 13,
		/**
		* Satellite service provision is already in progress.
		*/
		SATELLITE_SERVICE_PROVISION_IN_PROGRESS = 14,
		SERVICE_PROVISION_IN_PROGRESS = 14,
		/**
		* The ongoing request was aborted by either the satellite modem or the network.
		*/
		@@ -98,7 +98,7 @@ enum SatelliteError {
		* Satellite modem timeout to receive ACK or response from the satellite network after
		* sending a request to the network.
		*/
		SATELLITE_NETWORK_TIMEOUT = 17,
		NETWORK_TIMEOUT = 17,
		/**
		* Satellite network is not reachable from the modem.
		*/

telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java

+39 −15

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

		@Override
		public void setSatelliteEnabled(boolean enable, IIntegerConsumer errorCallback)
		public void requestSatelliteEnabled(boolean enable, IIntegerConsumer errorCallback)
		throws RemoteException {
		executeMethodAsync(
		() -> SatelliteImplBase.this.setSatelliteEnabled(enable, errorCallback),
		"setSatelliteEnabled");
		() -> SatelliteImplBase.this.requestSatelliteEnabled(enable, errorCallback),
		"requestSatelliteEnabled");
		}

		@Override
		@@ -206,11 +206,11 @@ public class SatelliteImplBase extends SatelliteService {
		}

		@Override
		public void requestIsSatelliteProvisioned(String token, IIntegerConsumer errorCallback,
		public void requestIsSatelliteProvisioned(IIntegerConsumer errorCallback,
		IBooleanConsumer callback) throws RemoteException {
		executeMethodAsync(
		() -> SatelliteImplBase.this
		.requestIsSatelliteProvisioned(token, errorCallback, callback),
		.requestIsSatelliteProvisioned(errorCallback, callback),
		"requestIsSatelliteProvisioned");
		}

		@@ -233,7 +233,7 @@ public class SatelliteImplBase extends SatelliteService {

		@Override
		public void requestSatelliteModemState(IIntegerConsumer errorCallback,
		ISatelliteModemStateConsumer callback) throws RemoteException {
		IIntegerConsumer callback) throws RemoteException {
		executeMethodAsync(
		() -> SatelliteImplBase.this
		.requestSatelliteModemState(errorCallback, callback),
		@@ -256,7 +256,7 @@ public class SatelliteImplBase extends SatelliteService {
		IIntegerConsumer callback) throws RemoteException {
		executeMethodAsync(
		() -> SatelliteImplBase.this
		.requestTimeForNextSatelliteVisibility(errorCallback, errorCallback),
		.requestTimeForNextSatelliteVisibility(errorCallback, callback),
		"requestTimeForNextSatelliteVisibility");
		}

		@@ -282,6 +282,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -303,6 +304,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -316,15 +318,16 @@ public class SatelliteImplBase extends SatelliteService {
		}

		/**
		* Enable or disable the satellite modem. If the satellite modem is enabled, this will also
		* disable the cellular modem, and if the satellite modem is disabled, this will also re-enable
		* the cellular modem.
		* Request to enable or disable the satellite modem. If the satellite modem is enabled,
		* this will also disable the cellular modem, and if the satellite modem is disabled,
		* this will also re-enable the cellular modem.
		*
		* @param enable True to enable the satellite modem and false to disable.
		* @param errorCallback The callback to receive the error code result of the operation.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -332,7 +335,7 @@ public class SatelliteImplBase extends SatelliteService {
		* SatelliteError:REQUEST_NOT_SUPPORTED
		* SatelliteError:NO_RESOURCES
		*/
		public void setSatelliteEnabled(boolean enable, @NonNull IIntegerConsumer errorCallback) {
		public void requestSatelliteEnabled(boolean enable, @NonNull IIntegerConsumer errorCallback) {
		// stub implementation
		}

		@@ -340,11 +343,13 @@ public class SatelliteImplBase extends SatelliteService {
		* Request to get whether the satellite modem is enabled.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether the satellite modem is enabled.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -361,11 +366,13 @@ public class SatelliteImplBase extends SatelliteService {
		* Request to get whether the satellite service is supported on the device.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether the satellite service is supported on the device.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -382,11 +389,13 @@ public class SatelliteImplBase extends SatelliteService {
		* Request to get the SatelliteCapabilities of the satellite service.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the SatelliteCapabilities of the satellite service.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -408,6 +417,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -427,6 +437,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -442,11 +453,13 @@ public class SatelliteImplBase extends SatelliteService {
		* Request to get the maximum number of characters per MO text message on satellite.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the maximum number of characters per MO text message on satellite.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -470,6 +483,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -495,6 +509,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -513,13 +528,14 @@ public class SatelliteImplBase extends SatelliteService {
		/**
		* Request to get whether this device is provisioned with a satellite provider.
		*
		* @param token The token of the device/subscription to be deprovisioned.
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether this device is provisioned with a satellite provider.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -527,8 +543,8 @@ public class SatelliteImplBase extends SatelliteService {
		* SatelliteError:REQUEST_NOT_SUPPORTED
		* SatelliteError:NO_RESOURCES
		*/
		public void requestIsSatelliteProvisioned(@NonNull String token,
		@NonNull IIntegerConsumer errorCallback, @NonNull IBooleanConsumer callback) {
		public void requestIsSatelliteProvisioned(@NonNull IIntegerConsumer errorCallback,
		@NonNull IBooleanConsumer callback) {
		// stub implementation
		}

		@@ -540,6 +556,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -567,6 +584,7 @@ public class SatelliteImplBase extends SatelliteService {
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:NETWORK_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		@@ -591,11 +609,13 @@ public class SatelliteImplBase extends SatelliteService {
		* ISatelliteListener#onSatelliteModemStateChanged.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the current satellite modem state.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -604,7 +624,7 @@ public class SatelliteImplBase extends SatelliteService {
		* SatelliteError:NO_RESOURCES
		*/
		public void requestSatelliteModemState(@NonNull IIntegerConsumer errorCallback,
		@NonNull ISatelliteModemStateConsumer callback) {
		@NonNull IIntegerConsumer callback) {
		// stub implementation
		}

		@@ -612,11 +632,13 @@ public class SatelliteImplBase extends SatelliteService {
		* Request to get whether satellite communication is allowed for the current location.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* whether satellite communication is allowed for the current location.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS
		@@ -635,11 +657,13 @@ public class SatelliteImplBase extends SatelliteService {
		* This will return 0 if the satellite is currently visible.
		*
		* @param errorCallback The callback to receive the error code result of the operation.
		* This must only be sent when the result is not SatelliteError#ERROR_NONE.
		* @param callback If the result is SatelliteError#ERROR_NONE, the callback to receive
		* the time after which the satellite will be visible.
		*
		* Valid error codes returned:
		* SatelliteError:ERROR_NONE
		* SatelliteError:SERVICE_ERROR
		* SatelliteError:MODEM_ERROR
		* SatelliteError:INVALID_MODEM_STATE
		* SatelliteError:INVALID_ARGUMENTS