Snap for 10118161 from 546aec90b7b83b4c79f3b06c95cb0421829e93fd to aml-frc-release Change-Id: I9e4734725180dc77f614b6f60dfdd0c1a274fe03
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java index ef3115b..b13a0fc 100644 --- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java +++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
@@ -18,16 +18,13 @@ import static android.telephony.satellite.SatelliteManager.SatelliteException; -import android.Manifest; import android.annotation.CallbackExecutor; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.RequiresPermission; import android.content.Context; import android.os.CancellationSignal; import android.os.OutcomeReceiver; -import android.os.RemoteException; import android.telephony.satellite.AntennaPosition; import android.telephony.satellite.PointingInfo; import android.telephony.satellite.SatelliteCapabilities; @@ -290,6 +287,10 @@ public static final int SATELLITE_NOT_AUTHORIZED = 19; /** The device does not support satellite. */ public static final int SATELLITE_NOT_SUPPORTED = 20; + /** The current request is already in-progress. */ + public static final int SATELLITE_REQUEST_IN_PROGRESS = 21; + /** Satellite modem is currently busy due to which current request cannot be processed. */ + public static final int SATELLITE_MODEM_BUSY = 22; /** @hide */ @IntDef( @@ -315,7 +316,9 @@ SATELLITE_NETWORK_TIMEOUT, SATELLITE_NOT_REACHABLE, SATELLITE_NOT_AUTHORIZED, - SATELLITE_NOT_SUPPORTED + SATELLITE_NOT_SUPPORTED, + SATELLITE_REQUEST_IN_PROGRESS, + SATELLITE_MODEM_BUSY }) @Retention(RetentionPolicy.SOURCE) public @interface SatelliteError {}