Merge "Add onRegistrationFailure api" 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 1ecd80b..e4f38f9 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
@@ -99,6 +99,10 @@
sSatelliteTransmissionUpdateCallbackWrapperMap = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<
+ SatelliteTransmissionUpdateCallbackWrapper2, SatelliteTransmissionUpdateCallback>
+ sSatelliteTransmissionUpdateCallbackWrapperMap2 = new ConcurrentHashMap<>();
+
+ private static final ConcurrentHashMap<
NtnSignalStrengthCallbackWrapper, NtnSignalStrengthCallback>
sNtnSignalStrengthCallbackWrapperMap = new ConcurrentHashMap<>();
@@ -706,6 +710,66 @@
}
/**
+ * Start receiving satellite transmission updates. This can be called by the pointing UI when the
+ * user starts pointing to the satellite. Modem should continue to report the pointing input as
+ * the device or satellite moves. Satellite transmission updates are started only on {@link
+ * #SATELLITE_RESULT_SUCCESS}. All other results indicate that this operation failed.
+ * Once satellite transmission updates begin, position and datagram transfer state updates
+ * will be sent through {@link SatelliteTransmissionUpdateCallback}.
+ */
+ public void startTransmissionUpdates2(
+ @NonNull @CallbackExecutor Executor executor,
+ @SatelliteResult @NonNull Consumer<Integer> resultListener,
+ @NonNull SatelliteTransmissionUpdateCallbackWrapper2 callback) {
+
+ SatelliteTransmissionUpdateCallback internalCallback =
+ new SatelliteTransmissionUpdateCallback() {
+
+ @Override
+ public void onSendDatagramStateChanged(
+ @SatelliteDatagramTransferState int state,
+ int sendPendingCount,
+ @SatelliteResult int errorCode) {
+ callback.onSendDatagramStateChanged(state, sendPendingCount, errorCode);
+ }
+
+ @Override
+ public void onSendDatagramStateChanged(
+ @SatelliteManager.DatagramType int datagramType,
+ @SatelliteDatagramTransferState int state,
+ int sendPendingCount,
+ @SatelliteResult int errorCode) {
+ callback.onSendDatagramStateChanged(
+ datagramType, state, sendPendingCount, errorCode);
+ }
+
+ @Override
+ public void onReceiveDatagramStateChanged(
+ @SatelliteDatagramTransferState int state,
+ int receivePendingCount,
+ @SatelliteResult int errorCode) {
+ callback.onReceiveDatagramStateChanged(state, receivePendingCount, errorCode);
+ }
+
+ @Override
+ public void onSatellitePositionChanged(@NonNull PointingInfo pointingInfo) {
+ callback.onSatellitePositionChanged(
+ new PointingInfoWrapper(
+ pointingInfo.getSatelliteAzimuthDegrees(),
+ pointingInfo.getSatelliteElevationDegrees()));
+ }
+
+ @Override
+ public void onSendDatagramRequested(@SatelliteManager.DatagramType int datagramType) {
+ callback.onSendDatagramRequested(datagramType);
+ }
+ };
+ sSatelliteTransmissionUpdateCallbackWrapperMap2.put(callback, internalCallback);
+
+ mSatelliteManager.startTransmissionUpdates(executor, resultListener, internalCallback);
+ }
+
+ /**
* Stop receiving satellite transmission updates. This can be called by the pointing UI when the
* user stops pointing to the satellite. Satellite transmission updates are stopped and the
* callback is unregistered only on {@link #SATELLITE_RESULT_SUCCESS}. All other results that this
@@ -716,7 +780,7 @@
@NonNull @CallbackExecutor Executor executor,
@SatelliteResult @NonNull Consumer<Integer> resultListener) {
SatelliteTransmissionUpdateCallback internalCallback =
- sSatelliteTransmissionUpdateCallbackWrapperMap.get(callback);
+ sSatelliteTransmissionUpdateCallbackWrapperMap.remove(callback);
if (internalCallback != null) {
mSatelliteManager.stopTransmissionUpdates(
internalCallback, executor, resultListener);
@@ -724,6 +788,24 @@
}
/**
+ * Stop receiving satellite transmission updates. This can be called by the pointing UI when the
+ * user stops pointing to the satellite. Satellite transmission updates are stopped and the
+ * callback is unregistered only on {@link #SATELLITE_RESULT_SUCCESS}. All other results that this
+ * operation failed.
+ */
+ public void stopTransmissionUpdates2(
+ @NonNull SatelliteTransmissionUpdateCallbackWrapper2 callback,
+ @NonNull @CallbackExecutor Executor executor,
+ @SatelliteResult @NonNull Consumer<Integer> resultListener) {
+ SatelliteTransmissionUpdateCallback internalCallback =
+ sSatelliteTransmissionUpdateCallbackWrapperMap2.remove(callback);
+ if (internalCallback != null) {
+ mSatelliteManager.stopTransmissionUpdates(
+ internalCallback, executor, resultListener);
+ }
+ }
+
+ /**
* Provision the device with a satellite provider. This is needed if the provider allows dynamic
* registration.
*/
@@ -782,7 +864,7 @@
public void unregisterForProvisionStateChanged(
@NonNull SatelliteProvisionStateCallbackWrapper callback) {
SatelliteProvisionStateCallback internalCallback =
- sSatelliteProvisionStateCallbackWrapperMap.get(callback);
+ sSatelliteProvisionStateCallbackWrapperMap.remove(callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForProvisionStateChanged(internalCallback);
}
@@ -857,7 +939,7 @@
*/
public void unregisterForModemStateChanged(
@NonNull SatelliteModemStateCallbackWrapper callback) {
- SatelliteModemStateCallback internalCallback = sSatelliteModemStateCallbackWrapperMap.get(
+ SatelliteModemStateCallback internalCallback = sSatelliteModemStateCallbackWrapperMap.remove(
callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForModemStateChanged(internalCallback);
@@ -870,7 +952,7 @@
*/
public void unregisterForModemStateChanged(
@NonNull SatelliteModemStateCallbackWrapper2 callback) {
- SatelliteModemStateCallback internalCallback = sSatelliteModemStateCallbackWrapperMap2.get(
+ SatelliteModemStateCallback internalCallback = sSatelliteModemStateCallbackWrapperMap2.remove(
callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForModemStateChanged(internalCallback);
@@ -907,7 +989,8 @@
* before, the request will be ignored.
*/
public void unregisterForIncomingDatagram(@NonNull SatelliteDatagramCallbackWrapper callback) {
- SatelliteDatagramCallback internalCallback = sSatelliteDatagramCallbackWrapperMap.get(callback);
+ SatelliteDatagramCallback internalCallback =
+ sSatelliteDatagramCallbackWrapperMap.remove(callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForIncomingDatagram(internalCallback);
}
@@ -976,7 +1059,7 @@
@NonNull CarrierRoamingNtnModeListenerWrapper listener) {
logd("unregisterForCarrierRoamingNtnModeChanged: subId=" + subId);
CarrierRoamingNtnModeListener internalListener =
- sCarrierRoamingNtnModeListenerWrapperMap.get(listener);
+ sCarrierRoamingNtnModeListenerWrapperMap.remove(listener);
if (internalListener != null) {
TelephonyManager tm = mTelephonyManager.createForSubscriptionId(subId);
tm.unregisterTelephonyCallback(internalListener);
@@ -988,7 +1071,7 @@
@NonNull CarrierRoamingNtnModeListenerWrapper2 listener) {
logd("unregisterForCarrierRoamingNtnModeChanged: subId=" + subId);
CarrierRoamingNtnModeListener internalListener =
- sCarrierRoamingNtnModeListenerWrapperMap.get(listener);
+ sCarrierRoamingNtnModeListenerWrapperMap.remove(listener);
if (internalListener != null) {
TelephonyManager tm = mTelephonyManager.createForSubscriptionId(subId);
tm.unregisterTelephonyCallback(internalListener);
@@ -1133,7 +1216,8 @@
@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
public void unregisterForNtnSignalStrengthChanged(
@NonNull NtnSignalStrengthCallbackWrapper callback) {
- NtnSignalStrengthCallback internalCallback = sNtnSignalStrengthCallbackWrapperMap.get(callback);
+ NtnSignalStrengthCallback internalCallback =
+ sNtnSignalStrengthCallbackWrapperMap.remove(callback);
if (internalCallback != null) {
try {
mSatelliteManager.unregisterForNtnSignalStrengthChanged(internalCallback);
@@ -1198,7 +1282,7 @@
public void unregisterForCapabilitiesChanged(
@NonNull SatelliteCapabilitiesCallbackWrapper callback) {
SatelliteCapabilitiesCallback internalCallback =
- sSatelliteCapabilitiesCallbackWrapperMap.get(callback);
+ sSatelliteCapabilitiesCallbackWrapperMap.remove(callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForCapabilitiesChanged(internalCallback);
}
@@ -1475,7 +1559,7 @@
public void unregisterForSupportedStateChanged(
@NonNull SatelliteSupportedStateCallbackWrapper callback) {
SatelliteSupportedStateCallback internalCallback =
- sSatelliteSupportedStateCallbackWrapperMap.get(callback);
+ sSatelliteSupportedStateCallbackWrapperMap.remove(callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForSupportedStateChanged(internalCallback);
}
@@ -1506,7 +1590,7 @@
public void unregisterForCommunicationAllowedStateChanged(
@NonNull SatelliteCommunicationAllowedStateCallbackWrapper callback) {
SatelliteCommunicationAllowedStateCallback internalCallback =
- sSatelliteCommunicationAllowedStateCallbackWrapperMap.get(callback);
+ sSatelliteCommunicationAllowedStateCallbackWrapperMap.remove(callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForCommunicationAllowedStateChanged(internalCallback);
}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteTransmissionUpdateCallbackWrapper2.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteTransmissionUpdateCallbackWrapper2.java
new file mode 100644
index 0000000..a02edcb
--- /dev/null
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteTransmissionUpdateCallbackWrapper2.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2024 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;
+
+/**
+ * A callback class for monitoring satellite position update and datagram transfer state change
+ * events.
+ */
+public interface SatelliteTransmissionUpdateCallbackWrapper2 {
+ /**
+ * Called when the satellite position changed.
+ *
+ * @param pointingInfo The pointing info containing the satellite location.
+ */
+ default 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.
+ */
+ default void onSendDatagramStateChanged(
+ @SatelliteManagerWrapper.SatelliteDatagramTransferState int state,
+ int sendPendingCount,
+ @SatelliteManagerWrapper.SatelliteResult int errorCode) {}
+
+ /**
+ * Called when satellite datagram send state changed.
+ *
+ * @param datagramType The datagram type of currently being sent.
+ * @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.
+ *
+ * @hide
+ */
+ default void onSendDatagramStateChanged(@SatelliteManagerWrapper.DatagramType int datagramType,
+ @SatelliteManagerWrapper.SatelliteDatagramTransferState int state, int sendPendingCount,
+ @SatelliteManagerWrapper.SatelliteResult 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.
+ */
+ default void onReceiveDatagramStateChanged(
+ @SatelliteManagerWrapper.SatelliteDatagramTransferState int state,
+ int receivePendingCount,
+ @SatelliteManagerWrapper.SatelliteResult int errorCode) {}
+
+ /**
+ * Called when framework receives a request to send a datagram.
+ *
+ * @param datagramType The type of the requested datagram.
+ */
+ default void onSendDatagramRequested(@SatelliteManagerWrapper.DatagramType int datagramType) {}
+}
