Merge "Added carrier Satellite APIs in SatelliteClient wrapper library" into main
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
index c1361a9..d230e8f 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
@@ -34,6 +34,7 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.satellite.AntennaPosition;
+import android.telephony.satellite.EnableRequestAttributes;
import android.telephony.satellite.NtnSignalStrength;
import android.telephony.satellite.NtnSignalStrengthCallback;
import android.telephony.satellite.PointingInfo;
@@ -430,10 +431,13 @@
public void requestEnabled(
boolean enableSatellite,
boolean enableDemoMode,
+ boolean isEmergency,
@NonNull @CallbackExecutor Executor executor,
@SatelliteResult @NonNull Consumer<Integer> resultListener) {
- mSatelliteManager.requestEnabled(
- enableSatellite, enableDemoMode, executor, resultListener);
+ mSatelliteManager.requestEnabled(new EnableRequestAttributes.Builder(enableSatellite)
+ .setDemoMode(enableDemoMode)
+ .setEmergencyMode(isEmergency)
+ .build(), executor, resultListener);
}
/** Request to get whether the satellite modem is enabled. */
@@ -474,6 +478,25 @@
mSatelliteManager.requestIsDemoModeEnabled(executor, internalCallback);
}
+ /** Request to get whether the satellite service is enabled for emergency mode */
+ public void requestIsEmergencyModeEnabled(
+ @NonNull @CallbackExecutor Executor executor,
+ @NonNull OutcomeReceiver<Boolean, SatelliteExceptionWrapper> callback) {
+ OutcomeReceiver internalCallback =
+ new OutcomeReceiver<Boolean, SatelliteException>() {
+ @Override
+ public void onResult(Boolean result) {
+ callback.onResult(result);
+ }
+
+ @Override
+ public void onError(SatelliteException exception) {
+ callback.onError(new SatelliteExceptionWrapper(exception.getErrorCode()));
+ }
+ };
+ mSatelliteManager.requestIsEmergencyModeEnabled(executor, internalCallback);
+ }
+
/** Request to get whether the satellite service is supported on the device. */
public void requestIsSupported(
@NonNull @CallbackExecutor Executor executor,