Snap for 11420186 from b424e1978634da1a4eec37a35033e75db49b181f to 24Q2-release Change-Id: I56984f1252193d38eb70285f3e83a8dc34497ee4
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java index 7b167fc..4310378 100644 --- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java +++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
@@ -29,6 +29,7 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; 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; @@ -392,10 +393,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. */ @@ -436,6 +440,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,