diff --git a/satellite_client/android.telephony.satellite.xml b/satellite_client/android.telephony.satellite.xml
index 9da6ebf..3d20465 100644
--- a/satellite_client/android.telephony.satellite.xml
+++ b/satellite_client/android.telephony.satellite.xml
@@ -1,4 +1,4 @@
 <permissions>
     <library name="android.telephony.satellite"
-            file="/system/framework/SatelliteClient.jar" />
+            file="/system_ext/framework/SatelliteClient.jar" />
 </permissions>
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/AntennaDirectionWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/AntennaDirectionWrapper.java
new file mode 100644
index 0000000..1eb8c40
--- /dev/null
+++ b/satellite_client/src/android/telephony/satellite/wrapper/AntennaDirectionWrapper.java
@@ -0,0 +1,91 @@
+/*
+ * 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.wrapper;
+
+import android.annotation.NonNull;
+import java.util.Objects;
+
+/**
+ * Antenna direction is provided as X/Y/Z values corresponding to the direction of the antenna main
+ * lobe as a unit vector in CTIA coordinate system (as specified in Appendix A of Wireless device
+ * CTIA OTAn test plan). CTIA coordinate system is defined relative to device’s screen when the
+ * device is held in default portrait mode with screen facing the user:
+ *
+ * <p>Z axis is vertical along the plane of the device with positive Z pointing up and negative z
+ * pointing towards bottom of the device Y axis is horizontal along the plane of the device with
+ * positive Y pointing towards right of the phone screen and negative Y pointing towards left X axis
+ * is orthogonal to the Y-Z plane (phone screen), pointing away from the phone screen for positive X
+ * and pointing away from back of the phone for negative X.
+ */
+public final class AntennaDirectionWrapper {
+  /** Antenna x axis direction. */
+  private float mX;
+
+  /** Antenna y axis direction. */
+  private float mY;
+
+  /** Antenna z axis direction. */
+  private float mZ;
+
+  public AntennaDirectionWrapper(float x, float y, float z) {
+    mX = x;
+    mY = y;
+    mZ = z;
+  }
+
+  @Override
+  @NonNull
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("X:");
+    sb.append(mX);
+    sb.append(",");
+
+    sb.append("Y:");
+    sb.append(mY);
+    sb.append(",");
+
+    sb.append("Z:");
+    sb.append(mZ);
+    return sb.toString();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    AntennaDirectionWrapper that = (AntennaDirectionWrapper) o;
+    return mX == that.mX && mY == that.mY && mZ == that.mZ;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mX, mY, mZ);
+  }
+
+  public float getX() {
+    return mX;
+  }
+
+  public float getY() {
+    return mY;
+  }
+
+  public float getZ() {
+    return mZ;
+  }
+}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/AntennaPositionWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/AntennaPositionWrapper.java
new file mode 100644
index 0000000..6b7d75f
--- /dev/null
+++ b/satellite_client/src/android/telephony/satellite/wrapper/AntennaPositionWrapper.java
@@ -0,0 +1,75 @@
+/*
+ * 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.wrapper;
+
+import android.annotation.NonNull;
+import java.util.Objects;
+
+/**
+ * Antenna Position received from satellite modem which gives information about antenna direction to
+ * be used with satellite communication and suggested device hold positions.
+ */
+public final class AntennaPositionWrapper {
+  /** Antenna direction used for satellite communication. */
+  @NonNull AntennaDirectionWrapper mAntennaDirection;
+
+  /** Enum corresponding to device hold position to be used by the end user. */
+  @SatelliteManagerWrapper.DeviceHoldPosition int mSuggestedHoldPosition;
+
+  public AntennaPositionWrapper(
+      @NonNull AntennaDirectionWrapper antennaDirection, int suggestedHoldPosition) {
+    this.mAntennaDirection = antennaDirection;
+    this.mSuggestedHoldPosition = suggestedHoldPosition;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    AntennaPositionWrapper that = (AntennaPositionWrapper) o;
+    return Objects.equals(mAntennaDirection, that.mAntennaDirection)
+        && mSuggestedHoldPosition == that.mSuggestedHoldPosition;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mAntennaDirection, mSuggestedHoldPosition);
+  }
+
+  @Override
+  @NonNull
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("antennaDirection:");
+    sb.append(mAntennaDirection);
+    sb.append(",");
+
+    sb.append("suggestedHoldPosition:");
+    sb.append(mSuggestedHoldPosition);
+    return sb.toString();
+  }
+
+  @NonNull
+  public AntennaDirectionWrapper getAntennaDirection() {
+    return mAntennaDirection;
+  }
+
+  @SatelliteManagerWrapper.DeviceHoldPosition
+  public int getSuggestedHoldPosition() {
+    return mSuggestedHoldPosition;
+  }
+}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/PointingInfoWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/PointingInfoWrapper.java
new file mode 100644
index 0000000..bc8f7c5
--- /dev/null
+++ b/satellite_client/src/android/telephony/satellite/wrapper/PointingInfoWrapper.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 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.wrapper;
+
+import android.annotation.NonNull;
+
+/** Encapsulates the Pointing Information. */
+public final class PointingInfoWrapper {
+  /** Satellite azimuth in degrees */
+  private final float mSatelliteAzimuthDegrees;
+
+  /** Satellite elevation in degrees */
+  private final float mSatelliteElevationDegrees;
+
+  public PointingInfoWrapper(float satelliteAzimuthDegrees, float satelliteElevationDegrees) {
+    this.mSatelliteAzimuthDegrees = satelliteAzimuthDegrees;
+    this.mSatelliteElevationDegrees = satelliteElevationDegrees;
+  }
+
+  public float getSatelliteAzimuthDegrees() {
+    return mSatelliteAzimuthDegrees;
+  }
+
+  public float getSatelliteElevationDegrees() {
+    return mSatelliteElevationDegrees;
+  }
+
+  @NonNull
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+
+    sb.append("SatelliteAzimuthDegrees:");
+    sb.append(mSatelliteAzimuthDegrees);
+    sb.append(",");
+
+    sb.append("SatelliteElevationDegrees:");
+    sb.append(mSatelliteElevationDegrees);
+    return sb.toString();
+  }
+}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteCapabilitiesWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteCapabilitiesWrapper.java
new file mode 100644
index 0000000..b6a045c
--- /dev/null
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteCapabilitiesWrapper.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2022 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.wrapper;
+
+import android.annotation.NonNull;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+/** Encapsulates the capabilities of Satellite */
+public final class SatelliteCapabilitiesWrapper {
+  /** List of technologies supported by the satellite modem. */
+  @NonNull @SatelliteManagerWrapper.NTRadioTechnology
+  private final Set<Integer> mSupportedRadioTechnologies;
+
+  /** Whether UE needs to point to a satellite to send and receive data. */
+  private final boolean mIsPointingRequired;
+
+  /** The maximum number of bytes per datagram that can be sent over satellite. */
+  private final int mMaxBytesPerOutgoingDatagram;
+
+  /**
+   * Antenna Position received from satellite modem which gives information about antenna direction
+   * to be used with satellite communication and suggested device hold positions. Map key: {@link
+   * SatelliteManager.DeviceHoldPosition} value: AntennaPosition
+   */
+  @NonNull private final Map<Integer, AntennaPositionWrapper> mAntennaPositionMap;
+
+  public SatelliteCapabilitiesWrapper(
+      Set<Integer> supportedRadioTechnologies,
+      boolean isPointingRequired,
+      int maxBytesPerOutgoingDatagram,
+      @NonNull Map<Integer, AntennaPositionWrapper> antennaPositionMap) {
+    this.mSupportedRadioTechnologies =
+        supportedRadioTechnologies == null ? new HashSet<>() : supportedRadioTechnologies;
+    this.mIsPointingRequired = isPointingRequired;
+    this.mMaxBytesPerOutgoingDatagram = maxBytesPerOutgoingDatagram;
+    this.mAntennaPositionMap = antennaPositionMap;
+  }
+
+  /**
+   * @return The list of technologies supported by the satellite modem.
+   */
+  @NonNull
+  @SatelliteManagerWrapper.NTRadioTechnology
+  public Set<Integer> getSupportedRadioTechnologies() {
+    return mSupportedRadioTechnologies;
+  }
+
+  /**
+   * Get whether UE needs to point to a satellite to send and receive data.
+   *
+   * @return {@code true} if UE needs to point to a satellite to send and receive data and {@code
+   *     false} otherwise.
+   */
+  public boolean isPointingRequired() {
+    return mIsPointingRequired;
+  }
+
+  /**
+   * The maximum number of bytes per datagram that can be sent over satellite.
+   *
+   * @return The maximum number of bytes per datagram that can be sent over satellite.
+   */
+  public int getMaxBytesPerOutgoingDatagram() {
+    return mMaxBytesPerOutgoingDatagram;
+  }
+
+  /**
+   * Antenna Position received from satellite modem which gives information about antenna direction
+   * to be used with satellite communication and suggested device hold positions.
+   *
+   * @return Map key: {@link SatelliteManager.DeviceHoldPosition} value: AntennaPosition
+   */
+  @NonNull
+  public Map<Integer, AntennaPositionWrapper> getAntennaPositionMap() {
+    return mAntennaPositionMap;
+  }
+
+  @Override
+  @NonNull
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+
+    sb.append("SupportedRadioTechnology:");
+    if (mSupportedRadioTechnologies != null && !mSupportedRadioTechnologies.isEmpty()) {
+      for (int technology : mSupportedRadioTechnologies) {
+        sb.append(technology);
+        sb.append(",");
+      }
+    } else {
+      sb.append("none,");
+    }
+
+    sb.append("isPointingRequired:");
+    sb.append(mIsPointingRequired);
+    sb.append(",");
+
+    sb.append("maxBytesPerOutgoingDatagram:");
+    sb.append(mMaxBytesPerOutgoingDatagram);
+    sb.append(",");
+
+    sb.append("antennaPositionMap:");
+    sb.append(mAntennaPositionMap);
+    return sb.toString();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    SatelliteCapabilitiesWrapper that = (SatelliteCapabilitiesWrapper) o;
+    return Objects.equals(mSupportedRadioTechnologies, that.mSupportedRadioTechnologies)
+        && mIsPointingRequired == that.mIsPointingRequired
+        && mMaxBytesPerOutgoingDatagram == that.mMaxBytesPerOutgoingDatagram
+        && Objects.equals(mAntennaPositionMap, that.mAntennaPositionMap);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        mSupportedRadioTechnologies,
+        mIsPointingRequired,
+        mMaxBytesPerOutgoingDatagram,
+        mAntennaPositionMap);
+  }
+}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteDatagramCallbackWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteDatagramCallbackWrapper.java
index 8ace911..adac477 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteDatagramCallbackWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteDatagramCallbackWrapper.java
@@ -16,26 +16,24 @@
 
 package android.telephony.satellite.wrapper;
 
-import android.telephony.satellite.SatelliteDatagram;
-
 import android.annotation.NonNull;
-
 import java.util.function.Consumer;
 
-/**
- * A callback class for listening to satellite datagrams.
- */
+/** A callback class for listening to satellite datagrams. */
 public interface SatelliteDatagramCallbackWrapper {
-    /**
-     * Called when there is an incoming datagram to be received.
-     *
-     * @param datagramId An id that uniquely identifies incoming datagram.
-     * @param datagram Datagram to be received over satellite.
-     * @param pendingCount Number of datagrams yet to be received by the app.
-     * @param callback This callback will be used by datagram receiver app to inform Telephony
-     *                 that they received the datagram. If the callback is not received within
-     *                 five minutes, Telephony will resend the datagram.
-     */
-    void onSatelliteDatagramReceived(long datagramId, @NonNull SatelliteDatagram datagram,
-            int pendingCount, @NonNull Consumer<Void> callback);
+  /**
+   * Called when there is an incoming datagram to be received.
+   *
+   * @param datagramId An id that uniquely identifies incoming datagram.
+   * @param datagram Datagram to be received over satellite.
+   * @param pendingCount Number of datagrams yet to be received by the app.
+   * @param callback This callback will be used by datagram receiver app to inform Telephony that
+   *     they received the datagram. If the callback is not received within five minutes, Telephony
+   *     will resend the datagram.
+   */
+  void onSatelliteDatagramReceived(
+      long datagramId,
+      @NonNull SatelliteDatagramWrapper datagram,
+      int pendingCount,
+      @NonNull Consumer<Void> callback);
 }
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteDatagramWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteDatagramWrapper.java
new file mode 100644
index 0000000..9a9f623
--- /dev/null
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteDatagramWrapper.java
@@ -0,0 +1,34 @@
+/*
+ * 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.wrapper;
+
+import android.annotation.NonNull;
+
+/** Encapsulates the Datagram to be sent or received over satellite */
+public final class SatelliteDatagramWrapper {
+  /** Datagram to be sent or received over satellite. */
+  @NonNull private final byte[] mData;
+
+  public SatelliteDatagramWrapper(@NonNull byte[] data) {
+    this.mData = data;
+  }
+
+  @NonNull
+  public byte[] getSatelliteDatagram() {
+    return mData;
+  }
+}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
index 4d72f10..22debf9 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
@@ -16,18 +16,16 @@
 
 package android.telephony.satellite.wrapper;
 
-import static android.telephony.satellite.SatelliteManager.DatagramType;
-import static android.telephony.satellite.SatelliteManager.SatelliteDatagramTransferState;
-import static android.telephony.satellite.SatelliteManager.SatelliteError;
 import static android.telephony.satellite.SatelliteManager.SatelliteException;
-import static android.telephony.satellite.SatelliteManager.SatelliteModemState;
 
 import android.annotation.CallbackExecutor;
+import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.content.Context;
 import android.os.CancellationSignal;
 import android.os.OutcomeReceiver;
+import android.telephony.satellite.AntennaPosition;
 import android.telephony.satellite.PointingInfo;
 import android.telephony.satellite.SatelliteCapabilities;
 import android.telephony.satellite.SatelliteDatagram;
@@ -36,7 +34,11 @@
 import android.telephony.satellite.SatelliteProvisionStateCallback;
 import android.telephony.satellite.SatelliteStateCallback;
 import android.telephony.satellite.SatelliteTransmissionUpdateCallback;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
@@ -79,6 +81,279 @@
   }
 
   /**
+   * Datagram type is unknown. This generic datagram type should be used only when the datagram type
+   * cannot be mapped to other specific datagram types.
+   */
+  public static final int DATAGRAM_TYPE_UNKNOWN = 0;
+  /** Datagram type indicating that the datagram to be sent or received is of type SOS message. */
+  public static final int DATAGRAM_TYPE_SOS_MESSAGE = 1;
+  /**
+   * Datagram type indicating that the datagram to be sent or received is of type location sharing.
+   */
+  public static final int DATAGRAM_TYPE_LOCATION_SHARING = 2;
+
+  /** @hide */
+  @IntDef(
+      prefix = "DATAGRAM_TYPE_",
+      value = {DATAGRAM_TYPE_UNKNOWN, DATAGRAM_TYPE_SOS_MESSAGE, DATAGRAM_TYPE_LOCATION_SHARING})
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface DatagramType {}
+
+  /**
+   * Unknown Non-Terrestrial radio technology. This generic radio technology should be used only
+   * when the radio technology cannot be mapped to other specific radio technologies.
+   */
+  public static final int NT_RADIO_TECHNOLOGY_UNKNOWN = 0;
+  /** 3GPP NB-IoT (Narrowband Internet of Things) over Non-Terrestrial-Networks technology. */
+  public static final int NT_RADIO_TECHNOLOGY_NB_IOT_NTN = 1;
+  /** 3GPP 5G NR over Non-Terrestrial-Networks technology. */
+  public static final int NT_RADIO_TECHNOLOGY_NR_NTN = 2;
+  /** 3GPP eMTC (enhanced Machine-Type Communication) over Non-Terrestrial-Networks technology. */
+  public static final int NT_RADIO_TECHNOLOGY_EMTC_NTN = 3;
+  /** Proprietary technology. */
+  public static final int NT_RADIO_TECHNOLOGY_PROPRIETARY = 4;
+
+  /** @hide */
+  @IntDef(
+      prefix = "NT_RADIO_TECHNOLOGY_",
+      value = {
+        NT_RADIO_TECHNOLOGY_UNKNOWN,
+        NT_RADIO_TECHNOLOGY_NB_IOT_NTN,
+        NT_RADIO_TECHNOLOGY_NR_NTN,
+        NT_RADIO_TECHNOLOGY_EMTC_NTN,
+        NT_RADIO_TECHNOLOGY_PROPRIETARY
+      })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface NTRadioTechnology {}
+
+  /** Satellite modem is in idle state. */
+  public static final int SATELLITE_MODEM_STATE_IDLE = 0;
+  /** Satellite modem is listening for incoming datagrams. */
+  public static final int SATELLITE_MODEM_STATE_LISTENING = 1;
+  /** Satellite modem is sending and/or receiving datagrams. */
+  public static final int SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING = 2;
+  /** Satellite modem is retrying to send and/or receive datagrams. */
+  public static final int SATELLITE_MODEM_STATE_DATAGRAM_RETRYING = 3;
+  /** Satellite modem is powered off. */
+  public static final int SATELLITE_MODEM_STATE_OFF = 4;
+  /** Satellite modem is unavailable. */
+  public static final int SATELLITE_MODEM_STATE_UNAVAILABLE = 5;
+  /**
+   * Satellite modem state is unknown. This generic modem state should be used only when the modem
+   * state cannot be mapped to other specific modem states.
+   */
+  public static final int SATELLITE_MODEM_STATE_UNKNOWN = -1;
+
+  /** @hide */
+  @IntDef(
+      prefix = {"SATELLITE_MODEM_STATE_"},
+      value = {
+        SATELLITE_MODEM_STATE_IDLE,
+        SATELLITE_MODEM_STATE_LISTENING,
+        SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING,
+        SATELLITE_MODEM_STATE_DATAGRAM_RETRYING,
+        SATELLITE_MODEM_STATE_OFF,
+        SATELLITE_MODEM_STATE_UNAVAILABLE,
+        SATELLITE_MODEM_STATE_UNKNOWN
+      })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface SatelliteModemState {}
+
+  /**
+   * The default state indicating that datagram transfer is idle. This should be sent if there are
+   * no message transfer activity happening.
+   */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE = 0;
+  /** A transition state indicating that a datagram is being sent. */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING = 1;
+  /**
+   * An end state indicating that datagram sending completed successfully. After datagram transfer
+   * completes, {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE} will be sent if no more messages are
+   * pending.
+   */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS = 2;
+  /**
+   * An end state indicating that datagram sending completed with a failure. After datagram transfer
+   * completes, {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE} must be sent before reporting any
+   * additional datagram transfer state changes. All pending messages will be reported as failed, to
+   * the corresponding applications.
+   */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED = 3;
+  /** A transition state indicating that a datagram is being received. */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING = 4;
+  /**
+   * An end state indicating that datagram receiving completed successfully. After datagram transfer
+   * completes, {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE} will be sent if no more messages are
+   * pending.
+   */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS = 5;
+  /**
+   * An end state indicating that datagram receive operation found that there are no messages to be
+   * retrieved from the satellite. After datagram transfer completes, {@link
+   * #SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE} will be sent if no more messages are pending.
+   */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE = 6;
+  /**
+   * An end state indicating that datagram receive completed with a failure. After datagram transfer
+   * completes, {@link #SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE} will be sent if no more messages are
+   * pending.
+   */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED = 7;
+  /**
+   * The datagram transfer state is unknown. This generic datagram transfer state should be used
+   * only when the datagram transfer state cannot be mapped to other specific datagram transfer
+   * states.
+   */
+  public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_UNKNOWN = -1;
+
+  /** @hide */
+  @IntDef(
+      prefix = {"SATELLITE_DATAGRAM_TRANSFER_STATE_"},
+      value = {
+        SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,
+        SATELLITE_DATAGRAM_TRANSFER_STATE_UNKNOWN
+      })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface SatelliteDatagramTransferState {}
+
+  /** The request was successfully processed. */
+  public static final int SATELLITE_ERROR_NONE = 0;
+  /** A generic error which should be used only when other specific errors cannot be used. */
+  public static final int SATELLITE_ERROR = 1;
+  /** Error received from the satellite server. */
+  public static final int SATELLITE_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.
+   */
+  public static final int SATELLITE_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.
+   */
+  public static final int SATELLITE_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.
+   */
+  public static final int SATELLITE_NETWORK_ERROR = 5;
+  /** Telephony is not in a valid state to receive requests from clients. */
+  public static final int SATELLITE_INVALID_TELEPHONY_STATE = 6;
+  /** Satellite modem is not in a valid state to receive requests from clients. */
+  public static final int SATELLITE_INVALID_MODEM_STATE = 7;
+  /**
+   * Either vendor service, or modem, or Telephony framework has received a request with invalid
+   * arguments from its clients.
+   */
+  public static final int SATELLITE_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.
+   */
+  public static final int SATELLITE_REQUEST_FAILED = 9;
+  /** Radio did not start or is resetting. */
+  public static final int SATELLITE_RADIO_NOT_AVAILABLE = 10;
+  /** The request is not supported by either the satellite modem or the network. */
+  public static final int SATELLITE_REQUEST_NOT_SUPPORTED = 11;
+  /** Satellite modem or network has no resources available to handle requests from clients. */
+  public static final int SATELLITE_NO_RESOURCES = 12;
+  /** Satellite service is not provisioned yet. */
+  public static final int SATELLITE_SERVICE_NOT_PROVISIONED = 13;
+  /** Satellite service provision is already in progress. */
+  public static final int SATELLITE_SERVICE_PROVISION_IN_PROGRESS = 14;
+  /**
+   * The ongoing request was aborted by either the satellite modem or the network. This error is
+   * also returned when framework decides to abort current send request as one of the previous send
+   * request failed.
+   */
+  public static final int SATELLITE_REQUEST_ABORTED = 15;
+  /** The device/subscriber is barred from accessing the satellite service. */
+  public static final int SATELLITE_ACCESS_BARRED = 16;
+  /**
+   * Satellite modem timeout to receive ACK or response from the satellite network after sending a
+   * request to the network.
+   */
+  public static final int SATELLITE_NETWORK_TIMEOUT = 17;
+  /** Satellite network is not reachable from the modem. */
+  public static final int SATELLITE_NOT_REACHABLE = 18;
+  /** The device/subscriber is not authorized to register with the satellite service provider. */
+  public static final int SATELLITE_NOT_AUTHORIZED = 19;
+  /** The device does not support satellite. */
+  public static final int SATELLITE_NOT_SUPPORTED = 20;
+
+  /** @hide */
+  @IntDef(
+      prefix = {"SATELLITE_"},
+      value = {
+        SATELLITE_ERROR_NONE,
+        SATELLITE_ERROR,
+        SATELLITE_SERVER_ERROR,
+        SATELLITE_SERVICE_ERROR,
+        SATELLITE_MODEM_ERROR,
+        SATELLITE_NETWORK_ERROR,
+        SATELLITE_INVALID_TELEPHONY_STATE,
+        SATELLITE_INVALID_MODEM_STATE,
+        SATELLITE_INVALID_ARGUMENTS,
+        SATELLITE_REQUEST_FAILED,
+        SATELLITE_RADIO_NOT_AVAILABLE,
+        SATELLITE_REQUEST_NOT_SUPPORTED,
+        SATELLITE_NO_RESOURCES,
+        SATELLITE_SERVICE_NOT_PROVISIONED,
+        SATELLITE_SERVICE_PROVISION_IN_PROGRESS,
+        SATELLITE_REQUEST_ABORTED,
+        SATELLITE_ACCESS_BARRED,
+        SATELLITE_NETWORK_TIMEOUT,
+        SATELLITE_NOT_REACHABLE,
+        SATELLITE_NOT_AUTHORIZED,
+        SATELLITE_NOT_SUPPORTED
+      })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface SatelliteError {}
+
+  /** Suggested device hold position is unknown. */
+  public static final int DEVICE_HOLD_POSITION_UNKNOWN = 0;
+  /** User is suggested to hold the device in portrait mode. */
+  public static final int DEVICE_HOLD_POSITION_PORTRAIT = 1;
+  /** User is suggested to hold the device in landscape mode with left hand. */
+  public static final int DEVICE_HOLD_POSITION_LANDSCAPE_LEFT = 2;
+  /** User is suggested to hold the device in landscape mode with right hand. */
+  public static final int DEVICE_HOLD_POSITION_LANDSCAPE_RIGHT = 3;
+
+  /** @hide */
+  @IntDef(
+      prefix = {"DEVICE_HOLD_POSITION_"},
+      value = {
+        DEVICE_HOLD_POSITION_UNKNOWN,
+        DEVICE_HOLD_POSITION_PORTRAIT,
+        DEVICE_HOLD_POSITION_LANDSCAPE_LEFT,
+        DEVICE_HOLD_POSITION_LANDSCAPE_RIGHT
+      })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface DeviceHoldPosition {}
+
+  /** Exception from the satellite service containing the {@link SatelliteError} error code. */
+  public static class SatelliteExceptionWrapper extends Exception {
+    private final int mErrorCode;
+
+    /** Create a SatelliteException with a given error code. */
+    public SatelliteExceptionWrapper(int errorCode) {
+      mErrorCode = errorCode;
+    }
+
+    /** Get the error code returned from the satellite service. */
+    public int getErrorCode() {
+      return mErrorCode;
+    }
+  }
+
+  /**
    * Request to enable or disable the satellite modem and demo mode. If the satellite modem is
    * enabled, this may also disable the cellular modem, and if the satellite modem is disabled, this
    * may also re-enable the cellular modem.
@@ -95,29 +370,82 @@
   /** Request to get whether the satellite modem is enabled. */
   public void requestIsSatelliteEnabled(
       @NonNull @CallbackExecutor Executor executor,
-      @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {
-    mSatelliteManager.requestIsSatelliteEnabled(executor, callback);
+      @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.requestIsSatelliteEnabled(executor, internalCallback);
   }
 
   /** Request to get whether the satellite service demo mode is enabled. */
   public void requestIsDemoModeEnabled(
       @NonNull @CallbackExecutor Executor executor,
-      @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {
-    mSatelliteManager.requestIsDemoModeEnabled(executor, callback);
+      @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.requestIsDemoModeEnabled(executor, internalCallback);
   }
 
   /** Request to get whether the satellite service is supported on the device. */
   public void requestIsSatelliteSupported(
       @NonNull @CallbackExecutor Executor executor,
-      @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {
-    mSatelliteManager.requestIsSatelliteSupported(executor, callback);
+      @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.requestIsSatelliteSupported(executor, internalCallback);
   }
 
   /** Request to get the {@link SatelliteCapabilities} of the satellite service. */
   public void requestSatelliteCapabilities(
       @NonNull @CallbackExecutor Executor executor,
-      @NonNull OutcomeReceiver<SatelliteCapabilities, SatelliteException> callback) {
-    mSatelliteManager.requestSatelliteCapabilities(executor, callback);
+      @NonNull OutcomeReceiver<SatelliteCapabilitiesWrapper, SatelliteExceptionWrapper> callback) {
+    OutcomeReceiver internalCallback =
+        new OutcomeReceiver<SatelliteCapabilities, SatelliteException>() {
+          @Override
+          public void onResult(SatelliteCapabilities result) {
+            callback.onResult(
+                new SatelliteCapabilitiesWrapper(
+                    result.getSupportedRadioTechnologies(),
+                    result.isPointingRequired(),
+                    result.getMaxBytesPerOutgoingDatagram(),
+                    transformToAntennaPositionWrapperMap(result.getAntennaPositionMap())));
+          }
+
+          @Override
+          public void onError(SatelliteException exception) {
+            callback.onError(new SatelliteExceptionWrapper(exception.getErrorCode()));
+          }
+        };
+    mSatelliteManager.requestSatelliteCapabilities(executor, internalCallback);
   }
 
   /**
@@ -154,7 +482,10 @@
 
           @Override
           public void onSatellitePositionChanged(@NonNull PointingInfo pointingInfo) {
-            callback.onSatellitePositionChanged(pointingInfo);
+            callback.onSatellitePositionChanged(
+                new PointingInfoWrapper(
+                    pointingInfo.getSatelliteAzimuthDegrees(),
+                    pointingInfo.getSatelliteElevationDegrees()));
           }
         };
     sSatelliteTransmissionUpdateCallbackWrapperMap.put(callback, internalCallback);
@@ -241,8 +572,20 @@
   /** Request to get whether this device is provisioned with a satellite provider. */
   public void requestIsSatelliteProvisioned(
       @NonNull @CallbackExecutor Executor executor,
-      @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {
-    mSatelliteManager.requestIsSatelliteProvisioned(executor, callback);
+      @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.requestIsSatelliteProvisioned(executor, internalCallback);
   }
 
   /** Registers for modem state changed from satellite modem. */
@@ -289,7 +632,10 @@
               int pendingCount,
               @NonNull Consumer<Void> internalCallback) {
             callback.onSatelliteDatagramReceived(
-                datagramId, datagram, pendingCount, internalCallback);
+                datagramId,
+                new SatelliteDatagramWrapper(datagram.getSatelliteDatagram()),
+                pendingCount,
+                internalCallback);
           }
         };
     sSatelliteDatagramCallbackWrapperMap.put(callback, internalCallback);
@@ -324,19 +670,33 @@
    */
   public void sendSatelliteDatagram(
       @DatagramType int datagramType,
-      @NonNull SatelliteDatagram datagram,
+      @NonNull SatelliteDatagramWrapper datagram,
       boolean needFullScreenPointingUI,
       @NonNull @CallbackExecutor Executor executor,
       @SatelliteError @NonNull Consumer<Integer> resultListener) {
+    SatelliteDatagram datagramInternal = new SatelliteDatagram(datagram.getSatelliteDatagram());
     mSatelliteManager.sendSatelliteDatagram(
-        datagramType, datagram, needFullScreenPointingUI, executor, resultListener);
+        datagramType, datagramInternal, needFullScreenPointingUI, executor, resultListener);
   }
 
   /** Request to get whether satellite communication is allowed for the current location. */
   public void requestIsSatelliteCommunicationAllowedForCurrentLocation(
       @NonNull @CallbackExecutor Executor executor,
-      @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {
-    mSatelliteManager.requestIsSatelliteCommunicationAllowedForCurrentLocation(executor, callback);
+      @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.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+        executor, internalCallback);
   }
 
   /**
@@ -345,7 +705,38 @@
    */
   public void requestTimeForNextSatelliteVisibility(
       @NonNull @CallbackExecutor Executor executor,
-      @NonNull OutcomeReceiver<Duration, SatelliteException> callback) {
-    mSatelliteManager.requestTimeForNextSatelliteVisibility(executor, callback);
+      @NonNull OutcomeReceiver<Duration, SatelliteExceptionWrapper> callback) {
+    OutcomeReceiver internalCallback =
+        new OutcomeReceiver<Duration, SatelliteException>() {
+          @Override
+          public void onResult(Duration result) {
+            callback.onResult(result);
+          }
+
+          @Override
+          public void onError(SatelliteException exception) {
+            callback.onError(new SatelliteExceptionWrapper(exception.getErrorCode()));
+          }
+        };
+    mSatelliteManager.requestTimeForNextSatelliteVisibility(executor, internalCallback);
   }
-}
\ No newline at end of file
+
+  private Map<Integer, AntennaPositionWrapper> transformToAntennaPositionWrapperMap(
+      Map<Integer, AntennaPosition> input) {
+    Map<Integer, AntennaPositionWrapper> output = new HashMap<>();
+    for (Map.Entry<Integer, AntennaPosition> entry : input.entrySet()) {
+      AntennaPosition position = entry.getValue();
+
+      output.put(
+          entry.getKey(),
+          new AntennaPositionWrapper(
+              new AntennaDirectionWrapper(
+                  position.getAntennaDirection().getX(),
+                  position.getAntennaDirection().getY(),
+                  position.getAntennaDirection().getZ()),
+              position.getSuggestedHoldPosition()));
+    }
+
+    return output;
+  }
+}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteProvisionStateCallbackWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteProvisionStateCallbackWrapper.java
index 5e2f0f7..5e69f70 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteProvisionStateCallbackWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteProvisionStateCallbackWrapper.java
@@ -16,15 +16,13 @@
 
 package android.telephony.satellite.wrapper;
 
-/**
- * A callback class for monitoring satellite provision state change events.
- */
+/** A callback class for monitoring satellite provision state change events. */
 public interface SatelliteProvisionStateCallbackWrapper {
-    /**
-     * Called when satellite provision state changes.
-     *
-     * @param provisioned The new provision state. {@code true} means satellite is provisioned
-     *                    {@code false} means satellite is not provisioned.
-     */
-    void onSatelliteProvisionStateChanged(boolean provisioned);
+  /**
+   * Called when satellite provision state changes.
+   *
+   * @param provisioned The new provision state. {@code true} means satellite is provisioned {@code
+   *     false} means satellite is not provisioned.
+   */
+  void onSatelliteProvisionStateChanged(boolean provisioned);
 }
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteStateCallbackWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteStateCallbackWrapper.java
index 154bed4..3d57fa0 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteStateCallbackWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteStateCallbackWrapper.java
@@ -16,16 +16,13 @@
 
 package android.telephony.satellite.wrapper;
 
-import static android.telephony.satellite.SatelliteManager.SatelliteModemState;
-
-/**
- * A callback class for monitoring satellite modem state change events.
- */
+/** A callback class for monitoring satellite modem state change events. */
 public interface SatelliteStateCallbackWrapper {
- 
-    /**
-     * Called when satellite modem state changes.
-     * @param state The new satellite modem state.
-     */
-    void onSatelliteModemStateChanged(@SatelliteModemState int state);
+
+  /**
+   * Called when satellite modem state changes.
+   *
+   * @param state The new satellite modem state.
+   */
+  void onSatelliteModemStateChanged(@SatelliteManagerWrapper.SatelliteModemState int state);
 }
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteTransmissionUpdateCallbackWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteTransmissionUpdateCallbackWrapper.java
index 15edfda..c65f4f6 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteTransmissionUpdateCallbackWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteTransmissionUpdateCallbackWrapper.java
@@ -16,11 +16,6 @@
 
 package android.telephony.satellite.wrapper;
 
-import static android.telephony.satellite.SatelliteManager.SatelliteDatagramTransferState;
-import static android.telephony.satellite.SatelliteManager.SatelliteError;
-
-import android.telephony.satellite.PointingInfo;
-
 import android.annotation.NonNull;
 
 /**
@@ -28,32 +23,34 @@
  * events.
  */
 public interface SatelliteTransmissionUpdateCallbackWrapper {
-    /**
-     * Called when the satellite position changed.
-     *
-     * @param pointingInfo The pointing info containing the satellite location.
-     */
-    void onSatellitePositionChanged(@NonNull PointingInfo pointingInfo);
+  /**
+   * Called when the satellite position changed.
+   *
+   * @param pointingInfo The pointing info containing the satellite location.
+   */
+  void onSatellitePositionChanged(@NonNull PointingInfoWrapper pointingInfo);
 
-    /**
-     * Called when satellite datagram send state changed.
-     *
-     * @param state The new send datagram transfer state.
-     * @param sendPendingCount The number of datagrams that are currently being sent.
-     * @param errorCode If datagram transfer failed, the reason for failure.
-     */
-    void onSendDatagramStateChanged(
-            @SatelliteDatagramTransferState int state, int sendPendingCount,
-            @SatelliteError int errorCode);
+  /**
+   * Called when satellite datagram send state changed.
+   *
+   * @param state The new send datagram transfer state.
+   * @param sendPendingCount The number of datagrams that are currently being sent.
+   * @param errorCode If datagram transfer failed, the reason for failure.
+   */
+  void onSendDatagramStateChanged(
+      @SatelliteManagerWrapper.SatelliteDatagramTransferState int state,
+      int sendPendingCount,
+      @SatelliteManagerWrapper.SatelliteError int errorCode);
 
-    /**
-     * Called when satellite datagram receive state changed.
-     *
-     * @param state The new receive datagram transfer state.
-     * @param receivePendingCount The number of datagrams that are currently pending to be received.
-     * @param errorCode If datagram transfer failed, the reason for failure.
-     */
-    void onReceiveDatagramStateChanged(
-            @SatelliteDatagramTransferState int state, int receivePendingCount,
-            @SatelliteError int errorCode);
+  /**
+   * Called when satellite datagram receive state changed.
+   *
+   * @param state The new receive datagram transfer state.
+   * @param receivePendingCount The number of datagrams that are currently pending to be received.
+   * @param errorCode If datagram transfer failed, the reason for failure.
+   */
+  void onReceiveDatagramStateChanged(
+      @SatelliteManagerWrapper.SatelliteDatagramTransferState int state,
+      int receivePendingCount,
+      @SatelliteManagerWrapper.SatelliteError int errorCode);
 }