Merge "Change SatelliteError to SatelliteResult enum" into main
diff --git a/src/java/com/android/internal/telephony/RILUtils.java b/src/java/com/android/internal/telephony/RILUtils.java
index ef50d65..d41b725 100644
--- a/src/java/com/android/internal/telephony/RILUtils.java
+++ b/src/java/com/android/internal/telephony/RILUtils.java
@@ -5760,7 +5760,7 @@
* @param error The satellite error.
* @return The converted SatelliteServiceResult.
*/
- @SatelliteManager.SatelliteError
+ @SatelliteManager.SatelliteResult
public static int convertToSatelliteError(
CommandException.Error error) {
switch (error) {
@@ -5769,35 +5769,35 @@
case MODEM_ERR:
//fallthrough to SYSTEM_ERR
case SYSTEM_ERR:
- return SatelliteManager.SATELLITE_MODEM_ERROR;
+ return SatelliteManager.SATELLITE_RESULT_MODEM_ERROR;
case INVALID_ARGUMENTS:
- return SatelliteManager.SATELLITE_INVALID_ARGUMENTS;
+ return SatelliteManager.SATELLITE_RESULT_INVALID_ARGUMENTS;
case INVALID_MODEM_STATE:
- return SatelliteManager.SATELLITE_INVALID_MODEM_STATE;
+ return SatelliteManager.SATELLITE_RESULT_INVALID_MODEM_STATE;
case RADIO_NOT_AVAILABLE:
- return SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE;
+ return SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE;
case REQUEST_NOT_SUPPORTED:
- return SatelliteManager.SATELLITE_REQUEST_NOT_SUPPORTED;
+ return SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED;
case NO_MEMORY:
//fallthrough to NO_RESOURCES
case NO_RESOURCES:
- return SatelliteManager.SATELLITE_NO_RESOURCES;
+ return SatelliteManager.SATELLITE_RESULT_NO_RESOURCES;
case NETWORK_ERR:
- return SatelliteManager.SATELLITE_NETWORK_ERROR;
+ return SatelliteManager.SATELLITE_RESULT_NETWORK_ERROR;
case NETWORK_TIMEOUT:
- return SatelliteManager.SATELLITE_NETWORK_TIMEOUT;
+ return SatelliteManager.SATELLITE_RESULT_NETWORK_TIMEOUT;
case NO_NETWORK_FOUND:
//fallthrough to NO_SATELLITE_SIGNAL
case NO_SATELLITE_SIGNAL:
- return SatelliteManager.SATELLITE_NOT_REACHABLE;
+ return SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE;
case ABORTED:
- return SatelliteManager.SATELLITE_REQUEST_ABORTED;
+ return SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED;
case ACCESS_BARRED:
- return SatelliteManager.SATELLITE_ACCESS_BARRED;
+ return SatelliteManager.SATELLITE_RESULT_ACCESS_BARRED;
case SUBSCRIBER_NOT_AUTHORIZED:
- return SatelliteManager.SATELLITE_NOT_AUTHORIZED;
+ return SatelliteManager.SATELLITE_RESULT_NOT_AUTHORIZED;
default:
- return SatelliteManager.SATELLITE_ERROR;
+ return SatelliteManager.SATELLITE_RESULT_ERROR;
}
}
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramController.java b/src/java/com/android/internal/telephony/satellite/DatagramController.java
index 600da1e..c71b394 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramController.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramController.java
@@ -59,7 +59,7 @@
@GuardedBy("mLock")
private int mSendPendingCount = 0;
@GuardedBy("mLock")
- private int mSendErrorCode = SatelliteManager.SATELLITE_ERROR_NONE;
+ private int mSendErrorCode = SatelliteManager.SATELLITE_RESULT_SUCCESS;
/** Variables used to update onReceiveDatagramStateChanged(). */
@GuardedBy("mLock")
private int mReceiveSubId;
@@ -69,7 +69,7 @@
@GuardedBy("mLock")
private int mReceivePendingCount = 0;
@GuardedBy("mLock")
- private int mReceiveErrorCode = SatelliteManager.SATELLITE_ERROR_NONE;
+ private int mReceiveErrorCode = SatelliteManager.SATELLITE_RESULT_SUCCESS;
private SatelliteDatagram mDemoModeDatagram;
private boolean mIsDemoMode = false;
@@ -130,9 +130,9 @@
* @param subId The subId of the subscription to register for incoming satellite datagrams.
* @param callback The callback to handle incoming datagrams over satellite.
*
- * @return The {@link SatelliteManager.SatelliteError} result of the operation.
+ * @return The {@link SatelliteManager.SatelliteResult} result of the operation.
*/
- @SatelliteManager.SatelliteError public int registerForSatelliteDatagram(int subId,
+ @SatelliteManager.SatelliteResult public int registerForSatelliteDatagram(int subId,
@NonNull ISatelliteDatagramCallback callback) {
return mDatagramReceiver.registerForSatelliteDatagram(subId, callback);
}
@@ -159,7 +159,7 @@
* long, SatelliteDatagram, int, Consumer)}
*
* @param subId The subId of the subscription used for receiving datagrams.
- * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.
+ * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.
*/
public void pollPendingSatelliteDatagrams(int subId, @NonNull Consumer<Integer> callback) {
mDatagramReceiver.pollPendingSatelliteDatagrams(subId, callback);
@@ -182,7 +182,7 @@
* Datagram will be passed down to modem without any encoding or encryption.
* @param needFullScreenPointingUI this is used to indicate pointingUI app to open in
* full screen mode.
- * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.
+ * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.
*/
public void sendSatelliteDatagram(int subId, @SatelliteManager.DatagramType int datagramType,
@NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java b/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
index 8ee22a6..22de8aa 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
@@ -212,20 +212,20 @@
mDatagramController.updateSendStatus(argument.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED,
getPendingDatagramCount(),
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
mDatagramController.updateSendStatus(argument.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
- 0, SatelliteManager.SATELLITE_ERROR_NONE);
+ 0, SatelliteManager.SATELLITE_RESULT_SUCCESS);
// report phone == null case
reportSendDatagramCompleted(argument,
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
argument.callback.accept(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
// Abort sending all the pending datagrams
abortSendingPendingDatagrams(argument.subId,
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
}
break;
@@ -239,7 +239,7 @@
(SendSatelliteDatagramArgument) request.argument;
synchronized (mLock) {
- if (mIsDemoMode && (error == SatelliteManager.SATELLITE_ERROR_NONE)) {
+ if (mIsDemoMode && (error == SatelliteManager.SATELLITE_RESULT_SUCCESS)) {
if (argument.skipCheckingSatelliteAligned) {
logd("Satellite was already aligned. No need to check alignment again");
} else if (!mIsAligned) {
@@ -262,7 +262,7 @@
mPendingNonEmergencyDatagramsMap.remove(argument.datagramId);
}
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
// Update send status for current datagram
mDatagramController.updateSendStatus(argument.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS,
@@ -278,7 +278,7 @@
} else {
mDatagramController.updateSendStatus(argument.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
- 0, SatelliteManager.SATELLITE_ERROR_NONE);
+ 0, SatelliteManager.SATELLITE_RESULT_SUCCESS);
// Send response for current datagram
argument.callback.accept(error);
}
@@ -289,7 +289,7 @@
getPendingDatagramCount(), error);
mDatagramController.updateSendStatus(argument.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
- 0, SatelliteManager.SATELLITE_ERROR_NONE);
+ 0, SatelliteManager.SATELLITE_RESULT_SUCCESS);
// Send response for current datagram
// after updating datagram transfer state internally.
argument.callback.accept(error);
@@ -297,7 +297,7 @@
mControllerMetricsStats.reportOutgoingDatagramFailCount(
argument.datagramType);
abortSendingPendingDatagrams(argument.subId,
- SatelliteManager.SATELLITE_REQUEST_ABORTED);
+ SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
}
}
break;
@@ -328,7 +328,7 @@
* Datagram will be passed down to modem without any encoding or encryption.
* @param needFullScreenPointingUI this is used to indicate pointingUI app to open in
* full screen mode.
- * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.
+ * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.
*/
public void sendSatelliteDatagram(int subId, @SatelliteManager.DatagramType int datagramType,
@NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,
@@ -356,7 +356,7 @@
datagramArgs.setDatagramStartTime();
mDatagramController.updateSendStatus(subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING,
- getPendingDatagramCount(), SatelliteManager.SATELLITE_ERROR_NONE);
+ getPendingDatagramCount(), SatelliteManager.SATELLITE_RESULT_SUCCESS);
sendRequestAsync(CMD_SEND_SATELLITE_DATAGRAM, datagramArgs, phone);
}
}
@@ -426,7 +426,7 @@
@NonNull DatagramDispatcherHandlerRequest request) {
SatelliteManager.SatelliteException exception =
new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_NOT_REACHABLE);
+ SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE);
Message message = obtainMessage(EVENT_SEND_SATELLITE_DATAGRAM_DONE, request);
AsyncResult.forMessage(message, null, exception);
message.sendToTarget();
@@ -474,7 +474,7 @@
datagramArg.setDatagramStartTime();
mDatagramController.updateSendStatus(datagramArg.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING,
- getPendingDatagramCount(), SatelliteManager.SATELLITE_ERROR_NONE);
+ getPendingDatagramCount(), SatelliteManager.SATELLITE_RESULT_SUCCESS);
sendRequestAsync(CMD_SEND_SATELLITE_DATAGRAM, datagramArg, phone);
}
}
@@ -488,7 +488,7 @@
@GuardedBy("mLock")
private void sendErrorCodeAndCleanupPendingDatagrams(
LinkedHashMap<Long, SendSatelliteDatagramArgument> pendingDatagramsMap,
- @SatelliteManager.SatelliteError int errorCode) {
+ @SatelliteManager.SatelliteResult int errorCode) {
if (pendingDatagramsMap.size() == 0) {
return;
}
@@ -515,7 +515,7 @@
*/
@GuardedBy("mLock")
private void abortSendingPendingDatagrams(int subId,
- @SatelliteManager.SatelliteError int errorCode) {
+ @SatelliteManager.SatelliteResult int errorCode) {
logd("abortSendingPendingDatagrams()");
sendErrorCodeAndCleanupPendingDatagrams(mPendingEmergencyDatagramsMap, errorCode);
sendErrorCodeAndCleanupPendingDatagrams(mPendingNonEmergencyDatagramsMap, errorCode);
@@ -545,7 +545,7 @@
}
private void reportSendDatagramCompleted(@NonNull SendSatelliteDatagramArgument argument,
- @NonNull @SatelliteManager.SatelliteError int resultCode) {
+ @NonNull @SatelliteManager.SatelliteResult int resultCode) {
SatelliteStats.getInstance().onSatelliteOutgoingDatagramMetrics(
new SatelliteStats.SatelliteOutgoingDatagramParams.Builder()
.setDatagramType(argument.datagramType)
@@ -589,13 +589,13 @@
mDatagramController.updateSendStatus(
SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED,
- getPendingDatagramCount(), SatelliteManager.SATELLITE_REQUEST_ABORTED);
+ getPendingDatagramCount(), SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
}
mDatagramController.updateSendStatus(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
- 0, SatelliteManager.SATELLITE_ERROR_NONE);
+ 0, SatelliteManager.SATELLITE_RESULT_SUCCESS);
abortSendingPendingDatagrams(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
- SatelliteManager.SATELLITE_REQUEST_ABORTED);
+ SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
stopSatelliteAlignedTimer();
mIsDemoMode = false;
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java b/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
index e4c598b..4718976 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
@@ -329,11 +329,11 @@
if (pendingCount <= 0 && satelliteDatagram == null) {
sInstance.mDatagramController.updateReceiveStatus(mSubId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE,
- pendingCount, SatelliteManager.SATELLITE_ERROR_NONE);
+ pendingCount, SatelliteManager.SATELLITE_RESULT_SUCCESS);
} else if (satelliteDatagram != null) {
sInstance.mDatagramController.updateReceiveStatus(mSubId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS,
- pendingCount, SatelliteManager.SATELLITE_ERROR_NONE);
+ pendingCount, SatelliteManager.SATELLITE_RESULT_SUCCESS);
long datagramId = getDatagramId();
sInstance.mPendingAckCountHashMap.put(datagramId, getNumOfListeners());
@@ -350,13 +350,13 @@
});
sInstance.mControllerMetricsStats.reportIncomingDatagramCount(
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
}
if (pendingCount <= 0) {
sInstance.mDatagramController.updateReceiveStatus(mSubId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
- pendingCount, SatelliteManager.SATELLITE_ERROR_NONE);
+ pendingCount, SatelliteManager.SATELLITE_RESULT_SUCCESS);
} else {
// Poll for pending datagrams
IIntegerConsumer internalCallback = new IIntegerConsumer.Stub() {
@@ -372,7 +372,7 @@
// Send the captured data about incoming datagram to metric
sInstance.reportMetrics(
- satelliteDatagram, SatelliteManager.SATELLITE_ERROR_NONE);
+ satelliteDatagram, SatelliteManager.SATELLITE_RESULT_SUCCESS);
break;
}
@@ -433,19 +433,19 @@
mDatagramController.updateReceiveStatus(request.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,
mDatagramController.getReceivePendingCount(),
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
mDatagramController.updateReceiveStatus(request.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
mDatagramController.getReceivePendingCount(),
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
- reportMetrics(null, SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ reportMetrics(null, SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
mControllerMetricsStats.reportIncomingDatagramCount(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
// Send response for current request
((Consumer<Integer>) request.argument)
- .accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ .accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
break;
}
@@ -456,7 +456,7 @@
int error = SatelliteServiceUtils.getSatelliteError(ar,
"pollPendingSatelliteDatagrams");
- if (mIsDemoMode && error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (mIsDemoMode && error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
SatelliteDatagram datagram = mDatagramController.getDemoModeDatagram();
final int validSubId = SatelliteServiceUtils.getValidSatelliteSubId(
request.subId, mContext);
@@ -470,12 +470,12 @@
ar);
listenerHandler.sendMessage(message);
} else {
- error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
}
}
logd("EVENT_POLL_PENDING_SATELLITE_DATAGRAMS_DONE error: " + error);
- if (error != SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error != SatelliteManager.SATELLITE_RESULT_SUCCESS) {
mDatagramController.updateReceiveStatus(request.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,
mDatagramController.getReceivePendingCount(), error);
@@ -483,7 +483,7 @@
mDatagramController.updateReceiveStatus(request.subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
mDatagramController.getReceivePendingCount(),
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
reportMetrics(null, error);
mControllerMetricsStats.reportIncomingDatagramCount(error);
@@ -506,12 +506,12 @@
* @param subId The subId of the subscription to register for incoming satellite datagrams.
* @param callback The callback to handle incoming datagrams over satellite.
*
- * @return The {@link SatelliteManager.SatelliteError} result of the operation.
+ * @return The {@link SatelliteManager.SatelliteResult} result of the operation.
*/
- @SatelliteManager.SatelliteError public int registerForSatelliteDatagram(int subId,
+ @SatelliteManager.SatelliteResult public int registerForSatelliteDatagram(int subId,
@NonNull ISatelliteDatagramCallback callback) {
if (!SatelliteController.getInstance().isSatelliteSupported()) {
- return SatelliteManager.SATELLITE_NOT_SUPPORTED;
+ return SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED;
}
final int validSubId = SatelliteServiceUtils.getValidSatelliteSubId(subId, mContext);
@@ -533,7 +533,7 @@
satelliteDatagramListenerHandler.addListener(callback);
mSatelliteDatagramListenerHandlers.put(validSubId, satelliteDatagramListenerHandler);
- return SatelliteManager.SATELLITE_ERROR_NONE;
+ return SatelliteManager.SATELLITE_RESULT_SUCCESS;
}
/**
@@ -576,13 +576,13 @@
* #onSatelliteDatagramReceived(long, SatelliteDatagram, int, Consumer)}
*
* @param subId The subId of the subscription used for receiving datagrams.
- * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.
+ * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.
*/
public void pollPendingSatelliteDatagrams(int subId, @NonNull Consumer<Integer> callback) {
if (!mDatagramController.isPollingInIdleState()) {
// Poll request should be sent to satellite modem only when it is free.
logd("pollPendingSatelliteDatagrams: satellite modem is busy receiving datagrams.");
- callback.accept(SatelliteManager.SATELLITE_MODEM_BUSY);
+ callback.accept(SatelliteManager.SATELLITE_RESULT_MODEM_BUSY);
return;
}
@@ -594,14 +594,14 @@
if (!mDatagramController.isSendingInIdleState()) {
// Poll request should be sent to satellite modem only when it is free.
logd("pollPendingSatelliteDatagrams: satellite modem is busy sending datagrams.");
- callback.accept(SatelliteManager.SATELLITE_MODEM_BUSY);
+ callback.accept(SatelliteManager.SATELLITE_RESULT_MODEM_BUSY);
return;
}
mDatagramController.updateReceiveStatus(subId,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING,
mDatagramController.getReceivePendingCount(),
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
mDatagramTransferStartTime = System.currentTimeMillis();
Phone phone = SatelliteServiceUtils.getPhone();
@@ -649,7 +649,7 @@
} else {
Consumer<Integer> callback =
(Consumer<Integer>) mPollPendingSatelliteDatagramsRequest.argument;
- callback.accept(SatelliteManager.SATELLITE_REQUEST_ABORTED);
+ callback.accept(SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
}
}
mIsDemoMode = false;
@@ -663,11 +663,11 @@
mDatagramController.updateReceiveStatus(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED,
mDatagramController.getReceivePendingCount(),
- SatelliteManager.SATELLITE_REQUEST_ABORTED);
+ SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
}
mDatagramController.updateReceiveStatus(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE, 0,
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
cleanupDemoModeResources();
}
@@ -689,7 +689,7 @@
/** Report incoming datagram related metrics */
private void reportMetrics(@Nullable SatelliteDatagram satelliteDatagram,
- @NonNull @SatelliteManager.SatelliteError int resultCode) {
+ @NonNull @SatelliteManager.SatelliteResult int resultCode) {
int datagramSizeRoundedBytes = -1;
int datagramTransferTime = 0;
@@ -767,7 +767,7 @@
private void handleEventSatelliteAlignedTimeout(DatagramReceiverHandlerRequest request) {
SatelliteManager.SatelliteException exception =
new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_NOT_REACHABLE);
+ SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE);
Message message = obtainMessage(EVENT_POLL_PENDING_SATELLITE_DATAGRAMS_DONE, request);
AsyncResult.forMessage(message, null, exception);
message.sendToTarget();
diff --git a/src/java/com/android/internal/telephony/satellite/PointingAppController.java b/src/java/com/android/internal/telephony/satellite/PointingAppController.java
index 407db84..70d432e 100644
--- a/src/java/com/android/internal/telephony/satellite/PointingAppController.java
+++ b/src/java/com/android/internal/telephony/satellite/PointingAppController.java
@@ -320,7 +320,7 @@
if (handler != null) {
handler.removeListener(callback);
if (handler.hasListeners()) {
- result.accept(SatelliteManager.SATELLITE_ERROR_NONE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SUCCESS);
return;
}
@@ -332,7 +332,7 @@
handler);
} else {
if (phone == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
phone.unregisterForSatellitePositionInfoChanged(handler);
@@ -352,7 +352,7 @@
if (mStartedSatelliteTransmissionUpdates) {
logd("startSatelliteTransmissionUpdates: already started");
AsyncResult.forMessage(message, null, new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_ERROR_NONE));
+ SatelliteManager.SATELLITE_RESULT_SUCCESS));
message.sendToTarget();
return;
}
@@ -367,7 +367,7 @@
} else {
loge("startSatelliteTransmissionUpdates: No phone object");
AsyncResult.forMessage(message, null, new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE));
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE));
message.sendToTarget();
}
}
@@ -388,7 +388,7 @@
} else {
loge("startSatelliteTransmissionUpdates: No phone object");
AsyncResult.forMessage(message, null, new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE));
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE));
message.sendToTarget();
}
}
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
index 3c97354..ab137b6 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -606,7 +606,7 @@
(ProvisionSatelliteServiceArgument) request.argument;
if (mSatelliteProvisionCallbacks.containsKey(argument.subId)) {
argument.callback.accept(
- SatelliteManager.SATELLITE_SERVICE_PROVISION_IN_PROGRESS);
+ SatelliteManager.SATELLITE_RESULT_SERVICE_PROVISION_IN_PROGRESS);
notifyRequester(request);
break;
}
@@ -624,13 +624,15 @@
phone.provisionSatelliteService(onCompleted, argument.token);
} else {
loge("provisionSatelliteService: No phone object");
- argument.callback.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ argument.callback.accept(
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
notifyRequester(request);
mProvisionMetricsStats
- .setResultCode(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE)
+ .setResultCode(
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE)
.reportProvisionMetrics();
mControllerMetricsStats.reportProvisionCount(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
break;
}
@@ -666,12 +668,12 @@
loge("deprovisionSatelliteService: No phone object");
if (argument.callback != null) {
argument.callback.accept(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
- mProvisionMetricsStats
- .setResultCode(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE)
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
+ mProvisionMetricsStats.setResultCode(
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE)
.reportProvisionMetrics();
mControllerMetricsStats.reportDeprovisionCount(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
}
break;
@@ -701,7 +703,7 @@
int error = SatelliteServiceUtils.getSatelliteError(ar, "setSatelliteEnabled");
logd("EVENT_SET_SATELLITE_ENABLED_DONE = " + error);
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
if (argument.enableSatellite) {
synchronized (mSatelliteEnabledRequestLock) {
mWaitingForRadioDisabled = true;
@@ -730,14 +732,15 @@
// Previous mSatelliteEnabledRequest is successful but waiting for
// all radios to be turned off.
mSatelliteEnabledRequest.callback.accept(
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
}
}
synchronized (mIsSatelliteEnabledLock) {
if (!mWaitingForSatelliteModemOff) {
moveSatelliteToOffStateAndCleanUpResources(
- SatelliteManager.SATELLITE_ERROR_NONE, argument.callback);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS,
+ argument.callback);
} else {
logd("Wait for satellite modem off before updating satellite"
+ " modem state");
@@ -753,7 +756,7 @@
// Previous mSatelliteEnabledRequest is successful but waiting for
// all radios to be turned off.
mSatelliteEnabledRequest.callback.accept(
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
}
}
resetSatelliteEnabledRequest();
@@ -763,7 +766,7 @@
}
if (argument.enableSatellite) {
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
mControllerMetricsStats.onSatelliteEnabled();
mControllerMetricsStats.reportServiceEnablementSuccessCount();
} else {
@@ -795,7 +798,7 @@
} else {
loge("isSatelliteEnabled: No phone object");
((ResultReceiver) request.argument).send(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
}
break;
}
@@ -806,17 +809,17 @@
int error = SatelliteServiceUtils.getSatelliteError(ar,
"isSatelliteEnabled");
Bundle bundle = new Bundle();
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
if (ar.result == null) {
loge("isSatelliteEnabled: result is null");
- error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
} else {
boolean enabled = ((int[]) ar.result)[0] == 1;
if (DBG) logd("isSatelliteEnabled: " + enabled);
bundle.putBoolean(SatelliteManager.KEY_SATELLITE_ENABLED, enabled);
updateSatelliteEnabledState(enabled, "EVENT_IS_SATELLITE_ENABLED_DONE");
}
- } else if (error == SatelliteManager.SATELLITE_REQUEST_NOT_SUPPORTED) {
+ } else if (error == SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED) {
updateSatelliteSupportedStateWhenSatelliteServiceConnected(false);
}
((ResultReceiver) request.argument).send(error, bundle);
@@ -837,7 +840,7 @@
} else {
loge("isSatelliteSupported: No phone object");
((ResultReceiver) request.argument).send(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
}
break;
}
@@ -847,10 +850,10 @@
request = (SatelliteControllerHandlerRequest) ar.userObj;
int error = SatelliteServiceUtils.getSatelliteError(ar, "isSatelliteSupported");
Bundle bundle = new Bundle();
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
if (ar.result == null) {
loge("isSatelliteSupported: result is null");
- error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
} else {
boolean supported = (boolean) ar.result;
if (DBG) logd("isSatelliteSupported: " + supported);
@@ -875,7 +878,7 @@
} else {
loge("getSatelliteCapabilities: No phone object");
((ResultReceiver) request.argument).send(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
}
break;
}
@@ -886,10 +889,10 @@
int error = SatelliteServiceUtils.getSatelliteError(ar,
"getSatelliteCapabilities");
Bundle bundle = new Bundle();
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
if (ar.result == null) {
loge("getSatelliteCapabilities: result is null");
- error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
} else {
SatelliteCapabilities capabilities = (SatelliteCapabilities) ar.result;
synchronized (mNeedsSatellitePointingLock) {
@@ -923,7 +926,7 @@
} else {
loge("isSatelliteCommunicationAllowedForCurrentLocation: No phone object");
((ResultReceiver) request.argument).send(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
}
break;
}
@@ -934,10 +937,10 @@
int error = SatelliteServiceUtils.getSatelliteError(ar,
"isSatelliteCommunicationAllowedForCurrentLocation");
Bundle bundle = new Bundle();
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
if (ar.result == null) {
loge("isSatelliteCommunicationAllowedForCurrentLocation: result is null");
- error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
} else {
boolean communicationAllowed = (boolean) ar.result;
if (DBG) {
@@ -967,7 +970,7 @@
} else {
loge("requestTimeForNextSatelliteVisibility: No phone object");
((ResultReceiver) request.argument).send(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
}
break;
}
@@ -978,10 +981,10 @@
int error = SatelliteServiceUtils.getSatelliteError(ar,
"requestTimeForNextSatelliteVisibility");
Bundle bundle = new Bundle();
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
if (ar.result == null) {
loge("requestTimeForNextSatelliteVisibility: result is null");
- error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
} else {
int nextVisibilityDuration = ((int[]) ar.result)[0];
if (DBG) {
@@ -1058,7 +1061,7 @@
} else {
loge("isSatelliteProvisioned: No phone object");
((ResultReceiver) request.argument).send(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
}
break;
}
@@ -1069,10 +1072,10 @@
int error = SatelliteServiceUtils.getSatelliteError(ar,
"isSatelliteProvisioned");
Bundle bundle = new Bundle();
- if (error == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
if (ar.result == null) {
loge("isSatelliteProvisioned: result is null");
- error = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ error = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
} else {
boolean provisioned = ((int[]) ar.result)[0] == 1;
if (DBG) logd("isSatelliteProvisioned: " + provisioned);
@@ -1153,28 +1156,28 @@
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteSupported) {
- result.accept(SatelliteManager.SATELLITE_NOT_SUPPORTED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED);
return;
}
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteProvisioned) {
- result.accept(SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED);
return;
}
if (enableSatellite) {
if (!mIsRadioOn) {
loge("Radio is not on, can not enable satellite");
- result.accept(SatelliteManager.SATELLITE_INVALID_MODEM_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_MODEM_STATE);
return;
}
} else {
@@ -1188,12 +1191,12 @@
if (enableDemoMode != mIsDemoModeEnabled) {
loge("Received invalid demo mode while satellite session is enabled"
+ " enableDemoMode = " + enableDemoMode);
- result.accept(SatelliteManager.SATELLITE_INVALID_ARGUMENTS);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_ARGUMENTS);
return;
} else {
logd("Enable request matches with current state"
+ " enableSatellite = " + enableSatellite);
- result.accept(SatelliteManager.SATELLITE_ERROR_NONE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SUCCESS);
return;
}
}
@@ -1208,7 +1211,8 @@
* 2. If there is a ongoing request, then:
* 1. ongoing request = enable, current request = enable: return IN_PROGRESS error
* 2. ongoing request = disable, current request = disable: return IN_PROGRESS error
- * 3. ongoing request = disable, current request = enable: return SATELLITE_ERROR error
+ * 3. ongoing request = disable, current request = enable: return
+ * SATELLITE_RESULT_ERROR error
* 4. ongoing request = enable, current request = disable: send request to modem
*/
synchronized (mSatelliteEnabledRequestLock) {
@@ -1217,13 +1221,13 @@
} else if (mSatelliteEnabledRequest.enableSatellite == request.enableSatellite) {
logd("requestSatelliteEnabled enableSatellite: " + enableSatellite
+ " is already in progress.");
- result.accept(SatelliteManager.SATELLITE_REQUEST_IN_PROGRESS);
+ result.accept(SatelliteManager.SATELLITE_RESULT_REQUEST_IN_PROGRESS);
return;
} else if (mSatelliteEnabledRequest.enableSatellite == false
&& request.enableSatellite == true) {
logd("requestSatelliteEnabled enableSatellite: " + enableSatellite + " cannot be "
+ "processed. Disable satellite is already in progress.");
- result.accept(SatelliteManager.SATELLITE_ERROR);
+ result.accept(SatelliteManager.SATELLITE_RESULT_ERROR);
return;
}
}
@@ -1241,11 +1245,11 @@
public void requestIsSatelliteEnabled(int subId, @NonNull ResultReceiver result) {
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteSupported) {
- result.send(SatelliteManager.SATELLITE_NOT_SUPPORTED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED, null);
return;
}
@@ -1254,7 +1258,7 @@
/* We have already successfully queried the satellite modem. */
Bundle bundle = new Bundle();
bundle.putBoolean(SatelliteManager.KEY_SATELLITE_ENABLED, mIsSatelliteEnabled);
- result.send(SatelliteManager.SATELLITE_ERROR_NONE, bundle);
+ result.send(SatelliteManager.SATELLITE_RESULT_SUCCESS, bundle);
return;
}
}
@@ -1284,27 +1288,27 @@
public void requestIsDemoModeEnabled(int subId, @NonNull ResultReceiver result) {
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteSupported) {
- result.send(SatelliteManager.SATELLITE_NOT_SUPPORTED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED, null);
return;
}
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteProvisioned) {
- result.send(SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED, null);
return;
}
final Bundle bundle = new Bundle();
bundle.putBoolean(SatelliteManager.KEY_DEMO_MODE_ENABLED, mIsDemoModeEnabled);
- result.send(SatelliteManager.SATELLITE_ERROR_NONE, bundle);
+ result.send(SatelliteManager.SATELLITE_RESULT_SUCCESS, bundle);
}
/**
@@ -1329,7 +1333,7 @@
/* We have already successfully queried the satellite modem. */
Bundle bundle = new Bundle();
bundle.putBoolean(SatelliteManager.KEY_SATELLITE_SUPPORTED, mIsSatelliteSupported);
- result.send(SatelliteManager.SATELLITE_ERROR_NONE, bundle);
+ result.send(SatelliteManager.SATELLITE_RESULT_SUCCESS, bundle);
return;
}
}
@@ -1347,11 +1351,11 @@
public void requestSatelliteCapabilities(int subId, @NonNull ResultReceiver result) {
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteSupported) {
- result.send(SatelliteManager.SATELLITE_NOT_SUPPORTED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED, null);
return;
}
@@ -1360,7 +1364,7 @@
Bundle bundle = new Bundle();
bundle.putParcelable(SatelliteManager.KEY_SATELLITE_CAPABILITIES,
mSatelliteCapabilities);
- result.send(SatelliteManager.SATELLITE_ERROR_NONE, bundle);
+ result.send(SatelliteManager.SATELLITE_RESULT_SUCCESS, bundle);
return;
}
}
@@ -1383,21 +1387,21 @@
Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(errorCallback::accept);
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteSupported) {
- result.accept(SatelliteManager.SATELLITE_NOT_SUPPORTED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED);
return;
}
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteProvisioned) {
- result.accept(SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED);
return;
}
@@ -1422,21 +1426,21 @@
Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(errorCallback::accept);
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteSupported) {
- result.accept(SatelliteManager.SATELLITE_NOT_SUPPORTED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED);
return;
}
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteProvisioned) {
- result.accept(SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED);
return;
}
@@ -1470,23 +1474,23 @@
Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(callback::accept);
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return null;
}
if (!satelliteSupported) {
- result.accept(SatelliteManager.SATELLITE_NOT_SUPPORTED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED);
return null;
}
final int validSubId = SatelliteServiceUtils.getValidSatelliteSubId(subId, mContext);
if (mSatelliteProvisionCallbacks.containsKey(validSubId)) {
- result.accept(SatelliteManager.SATELLITE_SERVICE_PROVISION_IN_PROGRESS);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SERVICE_PROVISION_IN_PROGRESS);
return null;
}
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned != null && satelliteProvisioned) {
- result.accept(SatelliteManager.SATELLITE_ERROR_NONE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SUCCESS);
return null;
}
@@ -1521,21 +1525,21 @@
Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(callback::accept);
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteSupported) {
- result.accept(SatelliteManager.SATELLITE_NOT_SUPPORTED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED);
return;
}
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteProvisioned) {
- result.accept(SatelliteManager.SATELLITE_ERROR_NONE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SUCCESS);
return;
}
@@ -1552,20 +1556,20 @@
* @param subId The subId of the subscription to register for provision state changed.
* @param callback The callback to handle the satellite provision state changed event.
*
- * @return The {@link SatelliteManager.SatelliteError} result of the operation.
+ * @return The {@link SatelliteManager.SatelliteResult} result of the operation.
*/
- @SatelliteManager.SatelliteError public int registerForSatelliteProvisionStateChanged(int subId,
- @NonNull ISatelliteProvisionStateCallback callback) {
+ @SatelliteManager.SatelliteResult public int registerForSatelliteProvisionStateChanged(
+ int subId, @NonNull ISatelliteProvisionStateCallback callback) {
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- return SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ return SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
}
if (!satelliteSupported) {
- return SatelliteManager.SATELLITE_NOT_SUPPORTED;
+ return SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED;
}
mSatelliteProvisionStateChangedListeners.put(callback.asBinder(), callback);
- return SatelliteManager.SATELLITE_ERROR_NONE;
+ return SatelliteManager.SATELLITE_RESULT_SUCCESS;
}
/**
@@ -1592,11 +1596,11 @@
public void requestIsSatelliteProvisioned(int subId, @NonNull ResultReceiver result) {
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteSupported) {
- result.send(SatelliteManager.SATELLITE_NOT_SUPPORTED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED, null);
return;
}
@@ -1605,7 +1609,7 @@
Bundle bundle = new Bundle();
bundle.putBoolean(SatelliteManager.KEY_SATELLITE_PROVISIONED,
mIsSatelliteProvisioned);
- result.send(SatelliteManager.SATELLITE_ERROR_NONE, bundle);
+ result.send(SatelliteManager.SATELLITE_RESULT_SUCCESS, bundle);
return;
}
}
@@ -1619,18 +1623,18 @@
* @param subId The subId of the subscription to register for satellite modem state changed.
* @param callback The callback to handle the satellite modem state changed event.
*
- * @return The {@link SatelliteManager.SatelliteError} result of the operation.
+ * @return The {@link SatelliteManager.SatelliteResult} result of the operation.
*/
- @SatelliteManager.SatelliteError public int registerForSatelliteModemStateChanged(int subId,
+ @SatelliteManager.SatelliteResult public int registerForSatelliteModemStateChanged(int subId,
@NonNull ISatelliteStateCallback callback) {
if (mSatelliteSessionController != null) {
mSatelliteSessionController.registerForSatelliteModemStateChanged(callback);
} else {
loge("registerForSatelliteModemStateChanged: mSatelliteSessionController"
+ " is not initialized yet");
- return SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ return SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
}
- return SatelliteManager.SATELLITE_ERROR_NONE;
+ return SatelliteManager.SATELLITE_RESULT_SUCCESS;
}
/**
@@ -1657,9 +1661,9 @@
* @param subId The subId of the subscription to register for incoming satellite datagrams.
* @param callback The callback to handle incoming datagrams over satellite.
*
- * @return The {@link SatelliteManager.SatelliteError} result of the operation.
+ * @return The {@link SatelliteManager.SatelliteResult} result of the operation.
*/
- @SatelliteManager.SatelliteError public int registerForSatelliteDatagram(int subId,
+ @SatelliteManager.SatelliteResult public int registerForSatelliteDatagram(int subId,
@NonNull ISatelliteDatagramCallback callback) {
return mDatagramController.registerForSatelliteDatagram(subId, callback);
}
@@ -1686,18 +1690,18 @@
* long, SatelliteDatagram, int, Consumer)}
*
* @param subId The subId of the subscription used for receiving datagrams.
- * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.
+ * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.
*/
public void pollPendingSatelliteDatagrams(int subId, @NonNull IIntegerConsumer callback) {
Consumer<Integer> result = FunctionalUtils.ignoreRemoteException(callback::accept);
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteProvisioned) {
- result.accept(SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED);
return;
}
@@ -1719,7 +1723,7 @@
* Datagram will be passed down to modem without any encoding or encryption.
* @param needFullScreenPointingUI this is used to indicate pointingUI app to open in
* full screen mode.
- * @param callback The callback to get {@link SatelliteManager.SatelliteError} of the request.
+ * @param callback The callback to get {@link SatelliteManager.SatelliteResult} of the request.
*/
public void sendSatelliteDatagram(int subId, @SatelliteManager.DatagramType int datagramType,
SatelliteDatagram datagram, boolean needFullScreenPointingUI,
@@ -1728,11 +1732,11 @@
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ result.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
if (!satelliteProvisioned) {
- result.accept(SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED);
+ result.accept(SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED);
return;
}
@@ -1761,11 +1765,11 @@
@NonNull ResultReceiver result) {
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteSupported) {
- result.send(SatelliteManager.SATELLITE_NOT_SUPPORTED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED, null);
return;
}
@@ -1783,21 +1787,21 @@
public void requestTimeForNextSatelliteVisibility(int subId, @NonNull ResultReceiver result) {
Boolean satelliteSupported = isSatelliteSupportedInternal();
if (satelliteSupported == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteSupported) {
- result.send(SatelliteManager.SATELLITE_NOT_SUPPORTED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED, null);
return;
}
Boolean satelliteProvisioned = isSatelliteProvisioned();
if (satelliteProvisioned == null) {
- result.send(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, null);
return;
}
if (!satelliteProvisioned) {
- result.send(SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED, null);
+ result.send(SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED, null);
return;
}
@@ -2009,7 +2013,7 @@
private void handleEventProvisionSatelliteServiceDone(
@NonNull ProvisionSatelliteServiceArgument arg,
- @SatelliteManager.SatelliteError int result) {
+ @SatelliteManager.SatelliteResult int result) {
logd("handleEventProvisionSatelliteServiceDone: result="
+ result + ", subId=" + arg.subId);
@@ -2018,11 +2022,11 @@
loge("handleEventProvisionSatelliteServiceDone: callback is null for subId="
+ arg.subId);
mProvisionMetricsStats
- .setResultCode(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE)
+ .setResultCode(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE)
.setIsProvisionRequest(true)
.reportProvisionMetrics();
mControllerMetricsStats.reportProvisionCount(
- SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
return;
}
callback.accept(result);
@@ -2030,7 +2034,7 @@
private void handleEventDeprovisionSatelliteServiceDone(
@NonNull ProvisionSatelliteServiceArgument arg,
- @SatelliteManager.SatelliteError int result) {
+ @SatelliteManager.SatelliteResult int result) {
if (arg == null) {
loge("handleEventDeprovisionSatelliteServiceDone: arg is null");
return;
@@ -2055,7 +2059,7 @@
"handleStartSatelliteTransmissionUpdatesDone");
arg.errorCallback.accept(errorCode);
- if (errorCode != SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (errorCode != SatelliteManager.SATELLITE_RESULT_SUCCESS) {
mPointingAppController.setStartedSatelliteTransmissionUpdates(false);
// We need to remove the callback from our listener list since the caller might not call
// stopSatelliteTransmissionUpdates to unregister the callback in case of failure.
@@ -2158,7 +2162,7 @@
phone.setSatellitePower(onCompleted, argument.enableSatellite);
} else {
loge("requestSatelliteEnabled: No phone object");
- argument.callback.accept(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ argument.callback.accept(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
}
@@ -2299,8 +2303,8 @@
|| ((mIsSatelliteEnabled == null || isSatelliteEnabled())
&& !mWaitingForDisableSatelliteModemResponse)) {
int error = (state == SatelliteManager.SATELLITE_MODEM_STATE_OFF)
- ? SatelliteManager.SATELLITE_ERROR_NONE
- : SatelliteManager.SATELLITE_INVALID_MODEM_STATE;
+ ? SatelliteManager.SATELLITE_RESULT_SUCCESS
+ : SatelliteManager.SATELLITE_RESULT_INVALID_MODEM_STATE;
Consumer<Integer> callback = null;
synchronized (mSatelliteEnabledRequestLock) {
if (mSatelliteEnabledRequest != null) {
@@ -2352,7 +2356,7 @@
synchronized (mIsSatelliteEnabledLock) {
mIsSatelliteEnabled = mSatelliteEnabledRequest.enableSatellite;
}
- mSatelliteEnabledRequest.callback.accept(SatelliteManager.SATELLITE_ERROR_NONE);
+ mSatelliteEnabledRequest.callback.accept(SatelliteManager.SATELLITE_RESULT_SUCCESS);
updateSatelliteEnabledState(
mSatelliteEnabledRequest.enableSatellite,
"EVENT_SET_SATELLITE_ENABLED_DONE");
@@ -2371,7 +2375,7 @@
}
private void moveSatelliteToOffStateAndCleanUpResources(
- @SatelliteManager.SatelliteError int error, @Nullable Consumer<Integer> callback) {
+ @SatelliteManager.SatelliteResult int error, @Nullable Consumer<Integer> callback) {
logd("moveSatelliteToOffStateAndCleanUpResources");
synchronized (mIsSatelliteEnabledLock) {
resetSatelliteEnabledRequest();
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java b/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java
index ebf7780..3d2dc19 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java
@@ -469,14 +469,14 @@
loge("requestSatelliteListeningEnabled: RemoteException " + e);
if (message != null) {
sendMessageWithResult(
- message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ message, null, SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
}
} else {
loge("requestSatelliteListeningEnabled: Satellite service is unavailable.");
if (message != null) {
sendMessageWithResult(message, null,
- SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
}
@@ -508,14 +508,14 @@
loge("enableCellularModemWhileSatelliteModeIsOn: RemoteException " + e);
if (message != null) {
sendMessageWithResult(
- message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ message, null, SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
}
} else {
loge("enableCellularModemWhileSatelliteModeIsOn: Satellite service is unavailable.");
if (message != null) {
sendMessageWithResult(message, null,
- SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
}
@@ -544,11 +544,13 @@
});
} catch (RemoteException e) {
loge("setSatelliteEnabled: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("setSatelliteEnabled: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -576,16 +578,18 @@
int[] enabled = new int[] {result ? 1 : 0};
logd("requestIsSatelliteEnabled: " + Arrays.toString(enabled));
Binder.withCleanCallingIdentity(() -> sendMessageWithResult(
- message, enabled, SatelliteManager.SATELLITE_ERROR_NONE));
+ message, enabled, SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
});
} catch (RemoteException e) {
loge("requestIsSatelliteEnabled: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("requestIsSatelliteEnabled: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -610,17 +614,18 @@
public void accept(boolean result) {
logd("requestIsSatelliteSupported: " + result);
Binder.withCleanCallingIdentity(() -> sendMessageWithResult(
- message, result, SatelliteManager.SATELLITE_ERROR_NONE));
+ message, result, SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
});
} catch (RemoteException e) {
loge("requestIsSatelliteSupported: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("requestIsSatelliteSupported: Satellite service is unavailable.");
sendMessageWithResult(
- message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ message, null, SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -648,16 +653,18 @@
SatelliteServiceUtils.fromSatelliteCapabilities(result);
logd("requestSatelliteCapabilities: " + capabilities);
Binder.withCleanCallingIdentity(() -> sendMessageWithResult(
- message, capabilities, SatelliteManager.SATELLITE_ERROR_NONE));
+ message, capabilities, SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
});
} catch (RemoteException e) {
loge("requestSatelliteCapabilities: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("requestSatelliteCapabilities: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -682,11 +689,13 @@
});
} catch (RemoteException e) {
loge("startSendingSatellitePointingInfo: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("startSendingSatellitePointingInfo: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -710,11 +719,13 @@
});
} catch (RemoteException e) {
loge("stopSendingSatellitePointingInfo: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("stopSendingSatellitePointingInfo: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -744,11 +755,13 @@
});
} catch (RemoteException e) {
loge("provisionSatelliteService: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("provisionSatelliteService: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -774,11 +787,13 @@
});
} catch (RemoteException e) {
loge("deprovisionSatelliteService: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("deprovisionSatelliteService: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -806,16 +821,18 @@
int[] provisioned = new int[] {result ? 1 : 0};
logd("requestIsSatelliteProvisioned: " + Arrays.toString(provisioned));
Binder.withCleanCallingIdentity(() -> sendMessageWithResult(
- message, provisioned, SatelliteManager.SATELLITE_ERROR_NONE));
+ message, provisioned, SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
});
} catch (RemoteException e) {
loge("requestIsSatelliteProvisioned: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("requestIsSatelliteProvisioned: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -840,11 +857,13 @@
});
} catch (RemoteException e) {
loge("pollPendingSatelliteDatagrams: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("pollPendingSatelliteDatagrams: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -874,11 +893,13 @@
});
} catch (RemoteException e) {
loge("sendSatelliteDatagram: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("sendSatelliteDatagram: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -907,16 +928,18 @@
int modemState = SatelliteServiceUtils.fromSatelliteModemState(result);
logd("requestSatelliteModemState: " + modemState);
Binder.withCleanCallingIdentity(() -> sendMessageWithResult(
- message, modemState, SatelliteManager.SATELLITE_ERROR_NONE));
+ message, modemState, SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
});
} catch (RemoteException e) {
loge("requestSatelliteModemState: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("requestSatelliteModemState: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -944,18 +967,21 @@
logd("requestIsSatelliteCommunicationAllowedForCurrentLocation: "
+ result);
Binder.withCleanCallingIdentity(() -> sendMessageWithResult(
- message, result, SatelliteManager.SATELLITE_ERROR_NONE));
+ message, result,
+ SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
});
} catch (RemoteException e) {
loge("requestIsSatelliteCommunicationAllowedForCurrentLocation: RemoteException "
+ e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("requestIsSatelliteCommunicationAllowedForCurrentLocation: "
+ "Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -987,16 +1013,18 @@
logd("requestTimeForNextSatelliteVisibility: "
+ Arrays.toString(time));
Binder.withCleanCallingIdentity(() -> sendMessageWithResult(
- message, time, SatelliteManager.SATELLITE_ERROR_NONE));
+ message, time, SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
});
} catch (RemoteException e) {
loge("requestTimeForNextSatelliteVisibility: RemoteException " + e);
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_SERVICE_ERROR);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
} else {
loge("requestTimeForNextSatelliteVisibility: Satellite service is unavailable.");
- sendMessageWithResult(message, null, SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE);
+ sendMessageWithResult(message, null,
+ SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
}
}
@@ -1036,8 +1064,8 @@
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)
protected static void sendMessageWithResult(@NonNull Message message, @Nullable Object result,
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = error == SatelliteManager.SATELLITE_ERROR_NONE
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = error == SatelliteManager.SATELLITE_RESULT_SUCCESS
? null : new SatelliteException(error);
AsyncResult.forMessage(message, result, exception);
message.sendToTarget();
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
index e1260b8..b098625 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
@@ -17,7 +17,7 @@
package com.android.internal.telephony.satellite;
import static android.telephony.satellite.SatelliteManager.KEY_SATELLITE_COMMUNICATION_ALLOWED;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_ERROR_NONE;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS;
import android.annotation.NonNull;
import android.os.AsyncResult;
@@ -148,7 +148,7 @@
mReceiverForRequestIsSatelliteAllowedForCurrentLocation = new ResultReceiver(this) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_COMMUNICATION_ALLOWED)) {
boolean isSatelliteCommunicationAllowed =
resultData.getBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED);
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java b/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
index 69fb036..4f6abf0 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
@@ -36,8 +36,8 @@
import android.telephony.satellite.SatelliteDatagram;
import android.telephony.satellite.SatelliteManager;
import android.telephony.satellite.stub.NTRadioTechnology;
-import android.telephony.satellite.stub.SatelliteError;
import android.telephony.satellite.stub.SatelliteModemState;
+import android.telephony.satellite.stub.SatelliteResult;
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.Phone;
@@ -83,53 +83,51 @@
/**
* Convert satellite error from service definition to framework definition.
* @param error The SatelliteError from the satellite service.
- * @return The converted SatelliteError for the framework.
+ * @return The converted SatelliteResult for the framework.
*/
- @SatelliteManager.SatelliteError public static int fromSatelliteError(int error) {
+ @SatelliteManager.SatelliteResult public static int fromSatelliteError(int error) {
switch (error) {
- case SatelliteError.ERROR_NONE:
- return SatelliteManager.SATELLITE_ERROR_NONE;
- case SatelliteError.SATELLITE_ERROR:
- return SatelliteManager.SATELLITE_ERROR;
- case SatelliteError.SERVER_ERROR:
- return SatelliteManager.SATELLITE_SERVER_ERROR;
- case SatelliteError.SERVICE_ERROR:
- return SatelliteManager.SATELLITE_SERVICE_ERROR;
- case SatelliteError.MODEM_ERROR:
- return SatelliteManager.SATELLITE_MODEM_ERROR;
- case SatelliteError.NETWORK_ERROR:
- return SatelliteManager.SATELLITE_NETWORK_ERROR;
- case SatelliteError.INVALID_TELEPHONY_STATE:
- return SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
- case SatelliteError.INVALID_MODEM_STATE:
- return SatelliteManager.SATELLITE_INVALID_MODEM_STATE;
- case SatelliteError.INVALID_ARGUMENTS:
- return SatelliteManager.SATELLITE_INVALID_ARGUMENTS;
- case SatelliteError.REQUEST_FAILED:
- return SatelliteManager.SATELLITE_REQUEST_FAILED;
- case SatelliteError.RADIO_NOT_AVAILABLE:
- return SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE;
- case SatelliteError.REQUEST_NOT_SUPPORTED:
- return SatelliteManager.SATELLITE_REQUEST_NOT_SUPPORTED;
- case SatelliteError.NO_RESOURCES:
- return SatelliteManager.SATELLITE_NO_RESOURCES;
- case SatelliteError.SERVICE_NOT_PROVISIONED:
- return SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED;
- case SatelliteError.SERVICE_PROVISION_IN_PROGRESS:
- return SatelliteManager.SATELLITE_SERVICE_PROVISION_IN_PROGRESS;
- case SatelliteError.REQUEST_ABORTED:
- return SatelliteManager.SATELLITE_REQUEST_ABORTED;
- case SatelliteError.SATELLITE_ACCESS_BARRED:
- return SatelliteManager.SATELLITE_ACCESS_BARRED;
- case SatelliteError.NETWORK_TIMEOUT:
- return SatelliteManager.SATELLITE_NETWORK_TIMEOUT;
- case SatelliteError.SATELLITE_NOT_REACHABLE:
- return SatelliteManager.SATELLITE_NOT_REACHABLE;
- case SatelliteError.NOT_AUTHORIZED:
- return SatelliteManager.SATELLITE_NOT_AUTHORIZED;
+ case SatelliteResult.SATELLITE_RESULT_SUCCESS:
+ return SatelliteManager.SATELLITE_RESULT_SUCCESS;
+ case SatelliteResult.SATELLITE_RESULT_ERROR:
+ return SatelliteManager.SATELLITE_RESULT_ERROR;
+ case SatelliteResult.SATELLITE_RESULT_SERVER_ERROR:
+ return SatelliteManager.SATELLITE_RESULT_SERVER_ERROR;
+ case SatelliteResult.SATELLITE_RESULT_SERVICE_ERROR:
+ return SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR;
+ case SatelliteResult.SATELLITE_RESULT_MODEM_ERROR:
+ return SatelliteManager.SATELLITE_RESULT_MODEM_ERROR;
+ case SatelliteResult.SATELLITE_RESULT_NETWORK_ERROR:
+ return SatelliteManager.SATELLITE_RESULT_NETWORK_ERROR;
+ case SatelliteResult.SATELLITE_RESULT_INVALID_MODEM_STATE:
+ return SatelliteManager.SATELLITE_RESULT_INVALID_MODEM_STATE;
+ case SatelliteResult.SATELLITE_RESULT_INVALID_ARGUMENTS:
+ return SatelliteManager.SATELLITE_RESULT_INVALID_ARGUMENTS;
+ case SatelliteResult.SATELLITE_RESULT_REQUEST_FAILED:
+ return SatelliteManager.SATELLITE_RESULT_REQUEST_FAILED;
+ case SatelliteResult.SATELLITE_RESULT_RADIO_NOT_AVAILABLE:
+ return SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE;
+ case SatelliteResult.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED:
+ return SatelliteManager.SATELLITE_RESULT_REQUEST_NOT_SUPPORTED;
+ case SatelliteResult.SATELLITE_RESULT_NO_RESOURCES:
+ return SatelliteManager.SATELLITE_RESULT_NO_RESOURCES;
+ case SatelliteResult.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED:
+ return SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED;
+ case SatelliteResult.SATELLITE_RESULT_SERVICE_PROVISION_IN_PROGRESS:
+ return SatelliteManager.SATELLITE_RESULT_SERVICE_PROVISION_IN_PROGRESS;
+ case SatelliteResult.SATELLITE_RESULT_REQUEST_ABORTED:
+ return SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED;
+ case SatelliteResult.SATELLITE_RESULT_ACCESS_BARRED:
+ return SatelliteManager.SATELLITE_RESULT_ACCESS_BARRED;
+ case SatelliteResult.SATELLITE_RESULT_NETWORK_TIMEOUT:
+ return SatelliteManager.SATELLITE_RESULT_NETWORK_TIMEOUT;
+ case SatelliteResult.SATELLITE_RESULT_NOT_REACHABLE:
+ return SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE;
+ case SatelliteResult.SATELLITE_RESULT_NOT_AUTHORIZED:
+ return SatelliteManager.SATELLITE_RESULT_NOT_AUTHORIZED;
}
loge("Received invalid satellite service error: " + error);
- return SatelliteManager.SATELLITE_SERVICE_ERROR;
+ return SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR;
}
/**
@@ -224,20 +222,20 @@
}
/**
- * Get the {@link SatelliteManager.SatelliteError} from the provided result.
+ * Get the {@link SatelliteManager.SatelliteResult} from the provided result.
*
* @param ar AsyncResult used to determine the error code.
* @param caller The satellite request.
*
- * @return The {@link SatelliteManager.SatelliteError} error code from the request.
+ * @return The {@link SatelliteManager.SatelliteResult} error code from the request.
*/
- @SatelliteManager.SatelliteError public static int getSatelliteError(@NonNull AsyncResult ar,
+ @SatelliteManager.SatelliteResult public static int getSatelliteError(@NonNull AsyncResult ar,
@NonNull String caller) {
int errorCode;
if (ar.exception == null) {
- errorCode = SatelliteManager.SATELLITE_ERROR_NONE;
+ errorCode = SatelliteManager.SATELLITE_RESULT_SUCCESS;
} else {
- errorCode = SatelliteManager.SATELLITE_ERROR;
+ errorCode = SatelliteManager.SATELLITE_RESULT_ERROR;
if (ar.exception instanceof CommandException) {
CommandException.Error error = ((CommandException) ar.exception).getCommandError();
errorCode = RILUtils.convertToSatelliteError(error);
diff --git a/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java b/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java
index 7a1de7c..0c18fac 100644
--- a/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java
+++ b/src/java/com/android/internal/telephony/satellite/metrics/ControllerMetricsStats.java
@@ -178,9 +178,9 @@
/** Report a counter when an attempt for incoming datagram is failed */
public void reportIncomingDatagramCount(
- @NonNull @SatelliteManager.SatelliteError int result) {
+ @NonNull @SatelliteManager.SatelliteResult int result) {
SatelliteStats.SatelliteControllerParams controllerParam;
- if (result == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (result == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
controllerParam = new SatelliteStats.SatelliteControllerParams.Builder()
.setCountOfIncomingDatagramSuccess(ADD_COUNT)
.build();
@@ -194,9 +194,9 @@
}
/** Report a counter when an attempt for de-provision is success or not */
- public void reportProvisionCount(@NonNull @SatelliteManager.SatelliteError int result) {
+ public void reportProvisionCount(@NonNull @SatelliteManager.SatelliteResult int result) {
SatelliteStats.SatelliteControllerParams controllerParam;
- if (result == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (result == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
controllerParam = new SatelliteStats.SatelliteControllerParams.Builder()
.setCountOfProvisionSuccess(ADD_COUNT)
.build();
@@ -210,9 +210,9 @@
}
/** Report a counter when an attempt for de-provision is success or not */
- public void reportDeprovisionCount(@NonNull @SatelliteManager.SatelliteError int result) {
+ public void reportDeprovisionCount(@NonNull @SatelliteManager.SatelliteResult int result) {
SatelliteStats.SatelliteControllerParams controllerParam;
- if (result == SatelliteManager.SATELLITE_ERROR_NONE) {
+ if (result == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
controllerParam = new SatelliteStats.SatelliteControllerParams.Builder()
.setCountOfDeprovisionSuccess(ADD_COUNT)
.build();
diff --git a/src/java/com/android/internal/telephony/satellite/metrics/ProvisionMetricsStats.java b/src/java/com/android/internal/telephony/satellite/metrics/ProvisionMetricsStats.java
index 38696aa..d48c488 100644
--- a/src/java/com/android/internal/telephony/satellite/metrics/ProvisionMetricsStats.java
+++ b/src/java/com/android/internal/telephony/satellite/metrics/ProvisionMetricsStats.java
@@ -58,7 +58,7 @@
}
/** Sets the resultCode for provision metrics */
- public ProvisionMetricsStats setResultCode(@SatelliteManager.SatelliteError int error) {
+ public ProvisionMetricsStats setResultCode(@SatelliteManager.SatelliteResult int error) {
mResultCode = error;
return this;
}
diff --git a/src/java/com/android/internal/telephony/satellite/metrics/SessionMetricsStats.java b/src/java/com/android/internal/telephony/satellite/metrics/SessionMetricsStats.java
index 776ba64..6585bec 100644
--- a/src/java/com/android/internal/telephony/satellite/metrics/SessionMetricsStats.java
+++ b/src/java/com/android/internal/telephony/satellite/metrics/SessionMetricsStats.java
@@ -30,7 +30,7 @@
private static final boolean DBG = false;
private static SessionMetricsStats sInstance = null;
- private @SatelliteManager.SatelliteError int mInitializationResult;
+ private @SatelliteManager.SatelliteResult int mInitializationResult;
private @SatelliteManager.NTRadioTechnology int mRadioTechnology;
private SessionMetricsStats() {
@@ -54,7 +54,7 @@
/** Sets the satellite initialization result */
public SessionMetricsStats setInitializationResult(
- @SatelliteManager.SatelliteError int result) {
+ @SatelliteManager.SatelliteResult int result) {
logd("setInitializationResult(" + result + ")");
mInitializationResult = result;
return this;
@@ -81,7 +81,7 @@
}
private void initializeSessionMetricsParam() {
- mInitializationResult = SatelliteManager.SATELLITE_ERROR_NONE;
+ mInitializationResult = SatelliteManager.SATELLITE_RESULT_SUCCESS;
mRadioTechnology = SatelliteManager.NT_RADIO_TECHNOLOGY_UNKNOWN;
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/metrics/PersistAtomsStorageTest.java b/tests/telephonytests/src/com/android/internal/telephony/metrics/PersistAtomsStorageTest.java
index 3307813..aa24c46 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/metrics/PersistAtomsStorageTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/metrics/PersistAtomsStorageTest.java
@@ -1017,7 +1017,8 @@
mSatelliteProvision1.isCanceled = false;
mSatelliteProvision2 = new SatelliteProvision();
- mSatelliteProvision2.resultCode = SatelliteProtoEnums.SATELLITE_SERVICE_NOT_PROVISIONED;
+ mSatelliteProvision2.resultCode =
+ SatelliteProtoEnums.SATELLITE_SERVICE_NOT_PROVISIONED;
mSatelliteProvision2.provisioningTimeSec = 0;
mSatelliteProvision2.isProvisionRequest = false;
mSatelliteProvision2.isCanceled = true;
diff --git a/tests/telephonytests/src/com/android/internal/telephony/metrics/SatelliteStatsTest.java b/tests/telephonytests/src/com/android/internal/telephony/metrics/SatelliteStatsTest.java
index 22032ae..4393f1c 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/metrics/SatelliteStatsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/metrics/SatelliteStatsTest.java
@@ -196,7 +196,8 @@
public void onSatelliteProvisionMetrics_withAtoms() throws Exception {
SatelliteStats.SatelliteProvisionParams param =
new SatelliteStats.SatelliteProvisionParams.Builder()
- .setResultCode(SatelliteProtoEnums.SATELLITE_SERVICE_PROVISION_IN_PROGRESS)
+ .setResultCode(
+ SatelliteProtoEnums.SATELLITE_SERVICE_PROVISION_IN_PROGRESS)
.setProvisioningTimeSec(5 * 1000)
.setIsProvisionRequest(true)
.setIsCanceled(false)
diff --git a/tests/telephonytests/src/com/android/internal/telephony/satellite/ControllerMetricsStatsTest.java b/tests/telephonytests/src/com/android/internal/telephony/satellite/ControllerMetricsStatsTest.java
index baa00c1..76cd4ad 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/satellite/ControllerMetricsStatsTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/satellite/ControllerMetricsStatsTest.java
@@ -280,7 +280,7 @@
public void testReportIncomingDatagramCount() {
mTestStats.initializeParams();
- int result = SatelliteManager.SATELLITE_ERROR_NONE;
+ int result = SatelliteManager.SATELLITE_RESULT_SUCCESS;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportIncomingDatagramCount(result);
}
@@ -303,7 +303,7 @@
assertEquals(0, mTestStats.mTotalBatteryChargedTimeSec);
mTestStats.initializeParams();
- result = SatelliteManager.SATELLITE_SERVER_ERROR;
+ result = SatelliteManager.SATELLITE_RESULT_SERVER_ERROR;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportIncomingDatagramCount(result);
}
@@ -326,7 +326,7 @@
assertEquals(0, mTestStats.mTotalBatteryChargedTimeSec);
mTestStats.initializeParams();
- result = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ result = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportIncomingDatagramCount(result);
}
@@ -354,7 +354,7 @@
public void testReportProvisionCount() {
mTestStats.initializeParams();
- int result = SatelliteManager.SATELLITE_ERROR_NONE;
+ int result = SatelliteManager.SATELLITE_RESULT_SUCCESS;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportProvisionCount(result);
}
@@ -377,7 +377,7 @@
assertEquals(0, mTestStats.mTotalBatteryChargedTimeSec);
mTestStats.initializeParams();
- result = SatelliteManager.SATELLITE_SERVER_ERROR;
+ result = SatelliteManager.SATELLITE_RESULT_SERVER_ERROR;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportProvisionCount(result);
}
@@ -400,7 +400,7 @@
assertEquals(0, mTestStats.mTotalBatteryChargedTimeSec);
mTestStats.initializeParams();
- result = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ result = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportProvisionCount(result);
}
@@ -428,7 +428,7 @@
public void testReportDeprovisionCount() {
mTestStats.initializeParams();
- int result = SatelliteManager.SATELLITE_ERROR_NONE;
+ int result = SatelliteManager.SATELLITE_RESULT_SUCCESS;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportDeprovisionCount(result);
}
@@ -451,7 +451,7 @@
assertEquals(0, mTestStats.mTotalBatteryChargedTimeSec);
mTestStats.initializeParams();
- result = SatelliteManager.SATELLITE_SERVER_ERROR;
+ result = SatelliteManager.SATELLITE_RESULT_SERVER_ERROR;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportDeprovisionCount(result);
}
@@ -474,7 +474,7 @@
assertEquals(0, mTestStats.mTotalBatteryChargedTimeSec);
mTestStats.initializeParams();
- result = SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
+ result = SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
for (int i = 0; i < 10; i++) {
mControllerMetricsStatsUT.reportDeprovisionCount(result);
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramDispatcherTest.java b/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramDispatcherTest.java
index bd1bfe4..059ddb1 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramDispatcherTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramDispatcherTest.java
@@ -139,18 +139,18 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
verifyNoMoreInteractions(mMockDatagramController);
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
}
@Test
@@ -162,7 +162,7 @@
mDatagramDispatcherUT.obtainMessage(2 /*EVENT_SEND_SATELLITE_DATAGRAM_DONE*/,
new AsyncResult(message.obj, null,
new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_SERVICE_ERROR)))
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR)))
.sendToTarget();
return null;
}).when(mMockSatelliteModemInterface).sendSatelliteDatagram(any(SatelliteDatagram.class),
@@ -177,18 +177,19 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED), eq(0),
- eq(SatelliteManager.SATELLITE_SERVICE_ERROR));
+ eq(SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
verifyNoMoreInteractions(mMockDatagramController);
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_SERVICE_ERROR);
+ assertThat(mResultListener.peek()).isEqualTo(
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
@Test
@@ -205,19 +206,19 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED), eq(0),
- eq(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE));
+ eq(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
verifyNoMoreInteractions(mMockDatagramController);
assertThat(mResultListener.peek())
- .isEqualTo(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ .isEqualTo(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
@Test
@@ -243,18 +244,18 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
verifyNoMoreInteractions(mMockDatagramController);
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
}
@Test
@@ -267,7 +268,7 @@
mDatagramDispatcherUT.obtainMessage(2 /*EVENT_SEND_SATELLITE_DATAGRAM_DONE*/,
new AsyncResult(message.obj, null,
new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_SERVICE_ERROR)))
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR)))
.sendToTarget();
return null;
}).when(mPhone).sendSatelliteDatagram(any(Message.class), any(SatelliteDatagram.class),
@@ -282,18 +283,19 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED), eq(0),
- eq(SatelliteManager.SATELLITE_SERVICE_ERROR));
+ eq(SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
verifyNoMoreInteractions(mMockDatagramController);
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_SERVICE_ERROR);
+ assertThat(mResultListener.peek()).isEqualTo(
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
@Test
@@ -320,16 +322,16 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mTestDemoModeDatagramDispatcher.setDemoMode(false);
mTestDemoModeDatagramDispatcher.setDeviceAlignedWithSatellite(false);
}
@@ -359,17 +361,18 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
processAllFutureMessages();
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED),
- anyInt(), eq(SatelliteManager.SATELLITE_NOT_REACHABLE));
+ anyInt(), eq(SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_NOT_REACHABLE);
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
+ assertThat(mResultListener.peek()).isEqualTo(
+ SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE);
mTestDemoModeDatagramDispatcher.setDemoMode(false);
mTestDemoModeDatagramDispatcher.setDeviceAlignedWithSatellite(false);
mTestDemoModeDatagramDispatcher.setDuration(previousTimer);
@@ -398,19 +401,19 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING), eq(1),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mTestDemoModeDatagramDispatcher.setDemoMode(false);
mTestDemoModeDatagramDispatcher.setDeviceAlignedWithSatellite(false);
@@ -449,11 +452,11 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(anyInt(),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED),
- eq(1), eq(SatelliteManager.SATELLITE_REQUEST_ABORTED));
+ eq(1), eq(SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED));
mInOrder.verify(mMockDatagramController)
.updateSendStatus(anyInt(),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
@Test
@@ -466,7 +469,7 @@
mInOrder.verify(mMockDatagramController)
.updateSendStatus(anyInt(),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
private static class TestDatagramDispatcher extends DatagramDispatcher {
diff --git a/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramReceiverTest.java b/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramReceiverTest.java
index 19716a1..f2e7947 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramReceiverTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/satellite/DatagramReceiverTest.java
@@ -159,9 +159,9 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
}
@Test
@@ -174,7 +174,7 @@
mDatagramReceiverUT.obtainMessage(2 /*EVENT_POLL_PENDING_SATELLITE_DATAGRAMS_DONE*/,
new AsyncResult(message.obj, null,
new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_SERVICE_ERROR)))
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR)))
.sendToTarget();
return null;
}).when(mMockSatelliteModemInterface).pollPendingSatelliteDatagrams(any(Message.class));
@@ -186,13 +186,14 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED),
- eq(0), eq(SatelliteManager.SATELLITE_SERVICE_ERROR));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR));
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_SERVICE_ERROR);
+ assertThat(mResultListener.peek()).isEqualTo(
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
@Test
@@ -208,18 +209,18 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED),
- eq(0), eq(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE));
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
assertThat(mResultListener.peek())
- .isEqualTo(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ .isEqualTo(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
@Test
@@ -243,9 +244,9 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
}
@Test
@@ -259,7 +260,7 @@
mDatagramReceiverUT.obtainMessage(2 /*EVENT_POLL_PENDING_SATELLITE_DATAGRAMS_DONE*/,
new AsyncResult(message.obj, null,
new SatelliteManager.SatelliteException(
- SatelliteManager.SATELLITE_SERVICE_ERROR)))
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR)))
.sendToTarget();
return null;
}).when(mPhone).pollPendingSatelliteDatagrams(any(Message.class));
@@ -271,13 +272,14 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING), eq(0),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED),
- eq(0), eq(SatelliteManager.SATELLITE_SERVICE_ERROR));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR));
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_SERVICE_ERROR);
+ assertThat(mResultListener.peek()).isEqualTo(
+ SatelliteManager.SATELLITE_RESULT_SERVICE_ERROR);
}
@Test
@@ -291,11 +293,11 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
@Test
@@ -309,11 +311,11 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
@Test
@@ -327,7 +329,7 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS),
- eq(10), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(10), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
@Test
@@ -343,19 +345,19 @@
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING),
anyInt(),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED),
anyInt(),
- eq(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE));
+ eq(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE));
verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
anyInt(),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
assertThat(mResultListener.peek())
- .isEqualTo(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ .isEqualTo(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
}
@Test
@@ -373,20 +375,20 @@
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING),
anyInt(),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
processAllFutureMessages();
verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED),
anyInt(),
- eq(SatelliteManager.SATELLITE_NOT_REACHABLE));
+ eq(SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE));
verify(mMockDatagramController)
.updateReceiveStatus(eq(SUB_ID),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
anyInt(),
- eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
assertThat(mResultListener.peek())
- .isEqualTo(SatelliteManager.SATELLITE_NOT_REACHABLE);
+ .isEqualTo(SatelliteManager.SATELLITE_RESULT_NOT_REACHABLE);
mTestDemoModeDatagramReceiver.setDemoMode(false);
mTestDemoModeDatagramReceiver.setDeviceAlignedWithSatellite(false);
@@ -399,7 +401,7 @@
mDatagramReceiverUT.pollPendingSatelliteDatagrams(SUB_ID, mResultListener::offer);
processAllMessages();
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_MODEM_BUSY);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_MODEM_BUSY);
}
@Test
@@ -409,7 +411,7 @@
mDatagramReceiverUT.pollPendingSatelliteDatagrams(SUB_ID, mResultListener::offer);
processAllMessages();
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_MODEM_BUSY);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_MODEM_BUSY);
}
@Test
@@ -433,11 +435,11 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(anyInt(),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED),
- eq(10), eq(SatelliteManager.SATELLITE_REQUEST_ABORTED));
+ eq(10), eq(SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED));
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(anyInt(),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
@Test
@@ -452,7 +454,7 @@
mInOrder.verify(mMockDatagramController)
.updateReceiveStatus(anyInt(),
eq(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE),
- eq(0), eq(SatelliteManager.SATELLITE_ERROR_NONE));
+ eq(0), eq(SatelliteManager.SATELLITE_RESULT_SUCCESS));
}
@Test
@@ -473,7 +475,7 @@
};
assertThat(mDatagramReceiverUT.registerForSatelliteDatagram(SUB_ID, callback))
- .isEqualTo(SatelliteManager.SATELLITE_NOT_SUPPORTED);
+ .isEqualTo(SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED);
}
private static class TestDatagramReceiver extends DatagramReceiver {
diff --git a/tests/telephonytests/src/com/android/internal/telephony/satellite/PointingAppControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/satellite/PointingAppControllerTest.java
index bfeec6e..96dcd85 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/satellite/PointingAppControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/satellite/PointingAppControllerTest.java
@@ -243,8 +243,8 @@
}
private void setUpResponseForStartTransmissionUpdates(
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SatelliteManager.SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SatelliteManager.SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -262,8 +262,8 @@
}
private void setUpResponseForStopTransmissionUpdates(
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SatelliteManager.SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SatelliteManager.SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -286,7 +286,7 @@
doReturn(false).when(mMockSatelliteModemInterface).isSatelliteServiceSupported();
Message testMessage = mTestSatelliteControllerHandler
.obtainMessage(EVENT_START_SATELLITE_TRANSMISSION_UPDATES_DONE, null);
- setUpResponseForStartTransmissionUpdates(SatelliteManager.SATELLITE_ERROR_NONE);
+ setUpResponseForStartTransmissionUpdates(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mPointingAppController.startSatelliteTransmissionUpdates(testMessage, mPhone);
processAllMessages();
@@ -297,7 +297,7 @@
verify(mPhone)
.startSatellitePositionUpdates(eq(testMessage));
- assertEquals(SatelliteManager.SATELLITE_ERROR_NONE, mResultCode);
+ assertEquals(SatelliteManager.SATELLITE_RESULT_SUCCESS, mResultCode);
assertTrue(mPointingAppController.getStartedSatelliteTransmissionUpdates());
}
@@ -309,7 +309,7 @@
mPointingAppController.setStartedSatelliteTransmissionUpdates(false);
Message testMessage = mTestSatelliteControllerHandler
.obtainMessage(EVENT_START_SATELLITE_TRANSMISSION_UPDATES_DONE, null);
- setUpResponseForStartTransmissionUpdates(SatelliteManager.SATELLITE_ERROR_NONE);
+ setUpResponseForStartTransmissionUpdates(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mPointingAppController.startSatelliteTransmissionUpdates(testMessage, mPhone);
verify(mMockSatelliteModemInterface)
@@ -322,7 +322,7 @@
assertTrue(mPointingAppController.getStartedSatelliteTransmissionUpdates());
- assertEquals(SatelliteManager.SATELLITE_ERROR_NONE, mResultCode);
+ assertEquals(SatelliteManager.SATELLITE_RESULT_SUCCESS, mResultCode);
}
@Test
@@ -343,14 +343,14 @@
assertFalse(mPointingAppController.getStartedSatelliteTransmissionUpdates());
- assertEquals(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, mResultCode);
+ assertEquals(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mResultCode);
}
@Test
public void testStopSatelliteTransmissionUpdates_CommandInterface()
throws Exception {
doReturn(false).when(mMockSatelliteModemInterface).isSatelliteServiceSupported();
- setUpResponseForStopTransmissionUpdates(SatelliteManager.SATELLITE_ERROR_NONE);
+ setUpResponseForStopTransmissionUpdates(SatelliteManager.SATELLITE_RESULT_SUCCESS);
Message testMessage = mTestSatelliteControllerHandler
.obtainMessage(EVENT_STOP_SATELLITE_TRANSMISSION_UPDATES_DONE, null);
mPointingAppController.stopSatelliteTransmissionUpdates(testMessage, mPhone);
@@ -365,14 +365,14 @@
assertFalse(mPointingAppController.getStartedSatelliteTransmissionUpdates());
- assertEquals(SatelliteManager.SATELLITE_ERROR_NONE, mResultCode);
+ assertEquals(SatelliteManager.SATELLITE_RESULT_SUCCESS, mResultCode);
}
@Test
public void testStopSatelliteTransmissionUpdates_success()
throws Exception {
doReturn(true).when(mMockSatelliteModemInterface).isSatelliteServiceSupported();
- setUpResponseForStopTransmissionUpdates(SatelliteManager.SATELLITE_ERROR_NONE);
+ setUpResponseForStopTransmissionUpdates(SatelliteManager.SATELLITE_RESULT_SUCCESS);
Message testMessage = mTestSatelliteControllerHandler
.obtainMessage(EVENT_STOP_SATELLITE_TRANSMISSION_UPDATES_DONE, null);
mPointingAppController.stopSatelliteTransmissionUpdates(testMessage, mPhone);
@@ -386,7 +386,7 @@
.stopSatellitePositionUpdates(eq(testMessage));
assertFalse(mPointingAppController.getStartedSatelliteTransmissionUpdates());
- assertEquals(SatelliteManager.SATELLITE_ERROR_NONE, mResultCode);
+ assertEquals(SatelliteManager.SATELLITE_RESULT_SUCCESS, mResultCode);
}
@Test
@@ -405,7 +405,7 @@
verify(mPhone, never())
.stopSatellitePositionUpdates(eq(testMessage));
- assertEquals(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE, mResultCode);
+ assertEquals(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mResultCode);
}
@@ -454,12 +454,12 @@
mSatelliteTransmissionUpdateCallback, mPhone);
mPointingAppController.updateSendDatagramTransferState(SUB_ID,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS, 1,
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
assertTrue(waitForSendDatagramStateChangedRessult(1));
assertEquals(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS,
mSatelliteTransmissionUpdateCallback.getState());
assertEquals(1, mSatelliteTransmissionUpdateCallback.getSendPendingCount());
- assertEquals(SatelliteManager.SATELLITE_ERROR_NONE,
+ assertEquals(SatelliteManager.SATELLITE_RESULT_SUCCESS,
mSatelliteTransmissionUpdateCallback.getErrorCode());
assertTrue(mSatelliteTransmissionUpdateCallback.inSendDatagramStateCallback);
mPointingAppController.unregisterForSatelliteTransmissionUpdates(SUB_ID,
@@ -473,12 +473,12 @@
mSatelliteTransmissionUpdateCallback, mPhone);
mPointingAppController.updateReceiveDatagramTransferState(SUB_ID,
SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS, 2,
- SatelliteManager.SATELLITE_ERROR_NONE);
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
assertTrue(waitForReceiveDatagramStateChangedRessult(1));
assertEquals(SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS,
mSatelliteTransmissionUpdateCallback.getState());
assertEquals(2, mSatelliteTransmissionUpdateCallback.getReceivePendingCount());
- assertEquals(SatelliteManager.SATELLITE_ERROR_NONE,
+ assertEquals(SatelliteManager.SATELLITE_RESULT_SUCCESS,
mSatelliteTransmissionUpdateCallback.getErrorCode());
assertTrue(mSatelliteTransmissionUpdateCallback.inReceiveDatagramStateCallback);
mPointingAppController.unregisterForSatelliteTransmissionUpdates(SUB_ID,
@@ -516,7 +516,7 @@
mResultListener::offer, callback1, mPhone);
processAllMessages();
//since there are 2 callbacks registered for this sub_id, Handler is not unregistered
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mResultListener.remove();
mPointingAppController.unregisterForSatelliteTransmissionUpdates(subId1,
mResultListener::offer, callback2, mPhone);
@@ -524,7 +524,7 @@
mPointingAppController.unregisterForSatelliteTransmissionUpdates(subId2,
mResultListener::offer, callback1, mPhone);
processAllMessages();
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mResultListener.remove();
mInOrder.verify(mPhone, never()).unregisterForSatellitePositionInfoChanged(
any(Handler.class));
@@ -532,7 +532,7 @@
mResultListener::offer, callback2, null);
processAllMessages();
assertThat(mResultListener.peek())
- .isEqualTo(SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE);
+ .isEqualTo(SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
mResultListener.remove();
mInOrder = null;
}
@@ -576,7 +576,7 @@
mResultListener::offer, callback1, mPhone);
processAllMessages();
//since there are 2 callbacks registered for this sub_id, Handler is not unregistered
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mResultListener.remove();
mPointingAppController.unregisterForSatelliteTransmissionUpdates(subId1,
mResultListener::offer, callback2, mPhone);
@@ -587,7 +587,7 @@
mPointingAppController.unregisterForSatelliteTransmissionUpdates(subId2,
mResultListener::offer, callback1, mPhone);
processAllMessages();
- assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_ERROR_NONE);
+ assertThat(mResultListener.peek()).isEqualTo(SatelliteManager.SATELLITE_RESULT_SUCCESS);
mResultListener.remove();
mInOrder.verify(mMockSatelliteModemInterface, never())
.unregisterForSatellitePositionInfoChanged(any(Handler.class));
diff --git a/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java
index cf2abe2..61e2fcd 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java
@@ -26,20 +26,20 @@
import static android.telephony.satellite.SatelliteManager.NT_RADIO_TECHNOLOGY_EMTC_NTN;
import static android.telephony.satellite.SatelliteManager.NT_RADIO_TECHNOLOGY_NR_NTN;
import static android.telephony.satellite.SatelliteManager.NT_RADIO_TECHNOLOGY_PROPRIETARY;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_ERROR;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_ERROR_NONE;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_INVALID_ARGUMENTS;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_INVALID_MODEM_STATE;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_INVALID_TELEPHONY_STATE;
import static android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_OFF;
import static android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_NOT_AUTHORIZED;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_NOT_SUPPORTED;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_NO_RESOURCES;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_RADIO_NOT_AVAILABLE;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_REQUEST_IN_PROGRESS;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_SERVICE_NOT_PROVISIONED;
-import static android.telephony.satellite.SatelliteManager.SATELLITE_SERVICE_PROVISION_IN_PROGRESS;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_ERROR;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_INVALID_ARGUMENTS;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_INVALID_MODEM_STATE;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_INVALID_TELEPHONY_STATE;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_NOT_AUTHORIZED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_NO_RESOURCES;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_RADIO_NOT_AVAILABLE;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_REQUEST_IN_PROGRESS;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SERVICE_NOT_PROVISIONED;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SERVICE_PROVISION_IN_PROGRESS;
+import static android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS;
import static com.android.internal.telephony.satellite.SatelliteController.SATELLITE_MODE_ENABLED_FALSE;
import static com.android.internal.telephony.satellite.SatelliteController.SATELLITE_MODE_ENABLED_TRUE;
@@ -174,12 +174,12 @@
new HashMap<>());
private Semaphore mSatelliteCapabilitiesSemaphore = new Semaphore(0);
private SatelliteCapabilities mQueriedSatelliteCapabilities = null;
- private int mQueriedSatelliteCapabilitiesResultCode = SATELLITE_ERROR_NONE;
+ private int mQueriedSatelliteCapabilitiesResultCode = SATELLITE_RESULT_SUCCESS;
private ResultReceiver mSatelliteCapabilitiesReceiver = new ResultReceiver(null) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
mQueriedSatelliteCapabilitiesResultCode = resultCode;
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_CAPABILITIES)) {
mQueriedSatelliteCapabilities = resultData.getParcelable(
KEY_SATELLITE_CAPABILITIES, SatelliteCapabilities.class);
@@ -200,13 +200,13 @@
};
private boolean mQueriedSatelliteSupported = false;
- private int mQueriedSatelliteSupportedResultCode = SATELLITE_ERROR_NONE;
+ private int mQueriedSatelliteSupportedResultCode = SATELLITE_RESULT_SUCCESS;
private Semaphore mSatelliteSupportSemaphore = new Semaphore(0);
private ResultReceiver mSatelliteSupportReceiver = new ResultReceiver(null) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
mQueriedSatelliteSupportedResultCode = resultCode;
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_SUPPORTED)) {
mQueriedSatelliteSupported = resultData.getBoolean(KEY_SATELLITE_SUPPORTED);
} else {
@@ -226,14 +226,14 @@
};
private boolean mQueriedIsSatelliteEnabled = false;
- private int mQueriedIsSatelliteEnabledResultCode = SATELLITE_ERROR_NONE;
+ private int mQueriedIsSatelliteEnabledResultCode = SATELLITE_RESULT_SUCCESS;
private Semaphore mIsSatelliteEnabledSemaphore = new Semaphore(0);
private ResultReceiver mIsSatelliteEnabledReceiver = new ResultReceiver(null) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
logd("mIsSatelliteEnabledReceiver: resultCode=" + resultCode);
mQueriedIsSatelliteEnabledResultCode = resultCode;
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_ENABLED)) {
mQueriedIsSatelliteEnabled = resultData.getBoolean(KEY_SATELLITE_ENABLED);
} else {
@@ -252,13 +252,13 @@
};
private boolean mQueriedIsDemoModeEnabled = false;
- private int mQueriedIsDemoModeEnabledResultCode = SATELLITE_ERROR_NONE;
+ private int mQueriedIsDemoModeEnabledResultCode = SATELLITE_RESULT_SUCCESS;
private Semaphore mIsDemoModeEnabledSemaphore = new Semaphore(0);
private ResultReceiver mIsDemoModeEnabledReceiver = new ResultReceiver(null) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
mQueriedIsDemoModeEnabledResultCode = resultCode;
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_DEMO_MODE_ENABLED)) {
mQueriedIsDemoModeEnabled = resultData.getBoolean(KEY_DEMO_MODE_ENABLED);
} else {
@@ -278,13 +278,13 @@
};
private boolean mQueriedIsSatelliteProvisioned = false;
- private int mQueriedIsSatelliteProvisionedResultCode = SATELLITE_ERROR_NONE;
+ private int mQueriedIsSatelliteProvisionedResultCode = SATELLITE_RESULT_SUCCESS;
private Semaphore mIsSatelliteProvisionedSemaphore = new Semaphore(0);
private ResultReceiver mIsSatelliteProvisionedReceiver = new ResultReceiver(null) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
mQueriedIsSatelliteProvisionedResultCode = resultCode;
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_PROVISIONED)) {
mQueriedIsSatelliteProvisioned =
resultData.getBoolean(KEY_SATELLITE_PROVISIONED);
@@ -305,13 +305,13 @@
};
private boolean mQueriedSatelliteAllowed = false;
- private int mQueriedSatelliteAllowedResultCode = SATELLITE_ERROR_NONE;
+ private int mQueriedSatelliteAllowedResultCode = SATELLITE_RESULT_SUCCESS;
private Semaphore mSatelliteAllowedSemaphore = new Semaphore(0);
private ResultReceiver mSatelliteAllowedReceiver = new ResultReceiver(null) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
mQueriedSatelliteAllowedResultCode = resultCode;
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_COMMUNICATION_ALLOWED)) {
mQueriedSatelliteAllowed = resultData.getBoolean(
KEY_SATELLITE_COMMUNICATION_ALLOWED);
@@ -333,13 +333,13 @@
private int mQueriedSatelliteVisibilityTime = -1;
private int mSatelliteNextVisibilityTime = 3600;
- private int mQueriedSatelliteVisibilityTimeResultCode = SATELLITE_ERROR_NONE;
+ private int mQueriedSatelliteVisibilityTimeResultCode = SATELLITE_RESULT_SUCCESS;
private Semaphore mSatelliteVisibilityTimeSemaphore = new Semaphore(0);
private ResultReceiver mSatelliteVisibilityTimeReceiver = new ResultReceiver(null) {
@Override
protected void onReceiveResult(int resultCode, Bundle resultData) {
mQueriedSatelliteVisibilityTimeResultCode = resultCode;
- if (resultCode == SATELLITE_ERROR_NONE) {
+ if (resultCode == SATELLITE_RESULT_SUCCESS) {
if (resultData.containsKey(KEY_SATELLITE_NEXT_VISIBILITY)) {
mQueriedSatelliteVisibilityTime = resultData.getInt(
KEY_SATELLITE_NEXT_VISIBILITY);
@@ -404,8 +404,9 @@
doReturn(mIsSatelliteServiceSupported)
.when(mMockSatelliteModemInterface).isSatelliteServiceSupported();
setUpResponseForRequestSatelliteCapabilities(
- mSatelliteCapabilities, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RADIO_NOT_AVAILABLE);
+ mSatelliteCapabilities, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteSupported(false,
+ SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
doNothing().when(mMockDatagramController).setDemoMode(anyBoolean());
doNothing().when(mMockSatelliteSessionController)
.onSatelliteEnabledStateChanged(anyBoolean());
@@ -450,135 +451,140 @@
@Test
public void testRequestIsSatelliteCommunicationAllowedForCurrentLocation() {
mSatelliteAllowedSemaphore.drainPermits();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(SUB_ID,
mSatelliteAllowedReceiver);
processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, mQueriedSatelliteAllowedResultCode);
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, mQueriedSatelliteAllowedResultCode);
resetSatelliteControllerUT();
mSatelliteControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(SUB_ID,
mSatelliteAllowedReceiver);
processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedSatelliteAllowedResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mQueriedSatelliteAllowedResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteAllowedForCurrentLocation(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteAllowedForCurrentLocation(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(SUB_ID,
mSatelliteAllowedReceiver);
processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(1));
- assertEquals(SATELLITE_ERROR_NONE, mQueriedSatelliteAllowedResultCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteAllowedResultCode);
assertTrue(mQueriedSatelliteAllowed);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpNullResponseForRequestIsSatelliteAllowedForCurrentLocation(SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpNullResponseForRequestIsSatelliteAllowedForCurrentLocation(SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(SUB_ID,
mSatelliteAllowedReceiver);
processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedSatelliteAllowedResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mQueriedSatelliteAllowedResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
setUpNullResponseForRequestIsSatelliteAllowedForCurrentLocation(
- SATELLITE_INVALID_MODEM_STATE);
+ SATELLITE_RESULT_INVALID_MODEM_STATE);
mSatelliteControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(SUB_ID,
mSatelliteAllowedReceiver);
processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(1));
- assertEquals(SATELLITE_INVALID_MODEM_STATE, mQueriedSatelliteAllowedResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE, mQueriedSatelliteAllowedResultCode);
}
@Test
public void testRequestTimeForNextSatelliteVisibility() {
mSatelliteVisibilityTimeSemaphore.drainPermits();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestTimeForNextSatelliteVisibility(SUB_ID,
mSatelliteVisibilityTimeReceiver);
processAllMessages();
assertTrue(waitForRequestTimeForNextSatelliteVisibilityResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, mQueriedSatelliteVisibilityTimeResultCode);
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, mQueriedSatelliteVisibilityTimeResultCode);
resetSatelliteControllerUT();
mSatelliteControllerUT.requestTimeForNextSatelliteVisibility(SUB_ID,
mSatelliteVisibilityTimeReceiver);
processAllMessages();
assertTrue(waitForRequestTimeForNextSatelliteVisibilityResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedSatelliteVisibilityTimeResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ mQueriedSatelliteVisibilityTimeResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
setUpResponseForRequestTimeForNextSatelliteVisibility(mSatelliteNextVisibilityTime,
- SATELLITE_ERROR_NONE);
+ SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestTimeForNextSatelliteVisibility(SUB_ID,
mSatelliteVisibilityTimeReceiver);
processAllMessages();
assertTrue(waitForRequestTimeForNextSatelliteVisibilityResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedSatelliteVisibilityTimeResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ mQueriedSatelliteVisibilityTimeResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
setUpResponseForRequestTimeForNextSatelliteVisibility(mSatelliteNextVisibilityTime,
- SATELLITE_ERROR_NONE);
+ SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestTimeForNextSatelliteVisibility(SUB_ID,
mSatelliteVisibilityTimeReceiver);
processAllMessages();
assertTrue(waitForRequestTimeForNextSatelliteVisibilityResult(1));
- assertEquals(SATELLITE_SERVICE_NOT_PROVISIONED, mQueriedSatelliteVisibilityTimeResultCode);
+ assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,
+ mQueriedSatelliteVisibilityTimeResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
setUpResponseForRequestTimeForNextSatelliteVisibility(mSatelliteNextVisibilityTime,
- SATELLITE_ERROR_NONE);
+ SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestTimeForNextSatelliteVisibility(SUB_ID,
mSatelliteVisibilityTimeReceiver);
processAllMessages();
assertTrue(waitForRequestTimeForNextSatelliteVisibilityResult(1));
- assertEquals(SATELLITE_ERROR_NONE, mQueriedSatelliteVisibilityTimeResultCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteVisibilityTimeResultCode);
assertEquals(mSatelliteNextVisibilityTime, mQueriedSatelliteVisibilityTime);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
setUpNullResponseForRequestTimeForNextSatelliteVisibility(
- SATELLITE_ERROR_NONE);
+ SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestTimeForNextSatelliteVisibility(SUB_ID,
mSatelliteVisibilityTimeReceiver);
processAllMessages();
assertTrue(waitForRequestTimeForNextSatelliteVisibilityResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedSatelliteVisibilityTimeResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ mQueriedSatelliteVisibilityTimeResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
setUpNullResponseForRequestTimeForNextSatelliteVisibility(
- SATELLITE_INVALID_MODEM_STATE);
+ SATELLITE_RESULT_INVALID_MODEM_STATE);
mSatelliteControllerUT.requestTimeForNextSatelliteVisibility(SUB_ID,
mSatelliteVisibilityTimeReceiver);
processAllMessages();
assertTrue(waitForRequestTimeForNextSatelliteVisibilityResult(1));
- assertEquals(SATELLITE_INVALID_MODEM_STATE, mQueriedSatelliteVisibilityTimeResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE,
+ mQueriedSatelliteVisibilityTimeResultCode);
}
@Test
@@ -590,16 +596,17 @@
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
// Fail to enable satellite when the device does not support satellite.
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
// Fail to enable satellite when the device is not provisioned yet.
mIIntegerConsumerResults.clear();
@@ -607,28 +614,29 @@
verify(mMockSatelliteSessionController, times(1)).onSatelliteEnabledStateChanged(eq(false));
verify(mMockSatelliteSessionController, times(1)).setDemoMode(eq(false));
verify(mMockDatagramController, times(1)).setDemoMode(eq(false));
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_SERVICE_NOT_PROVISIONED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,
+ (long) mIIntegerConsumerResults.get(0));
sendProvisionedStateChangedEvent(true, null);
processAllMessages();
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
// Successfully enable satellite
mIIntegerConsumerResults.clear();
mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled = false;
- setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(true, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);
assertTrue(mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled);
assertEquals(
SATELLITE_MODE_ENABLED_TRUE, mSatelliteControllerUT.satelliteModeSettingValue);
@@ -641,12 +649,12 @@
// Successfully disable satellite when radio is turned off.
mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled = false;
- setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_RESULT_SUCCESS);
setRadioPower(false);
processAllMessages();
sendSatelliteModemStateChangedEvent(SATELLITE_MODEM_STATE_OFF, null);
processAllMessages();
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
assertTrue(mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled);
assertEquals(
SATELLITE_MODE_ENABLED_FALSE, mSatelliteControllerUT.satelliteModeSettingValue);
@@ -657,27 +665,27 @@
// Fail to enable satellite when radio is off.
mIIntegerConsumerResults.clear();
- setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
// Radio is not on, can not enable satellite
- assertEquals(SATELLITE_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
setRadioPower(true);
processAllMessages();
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
// Fail to enable satellite with an error response from modem when radio is on.
mIIntegerConsumerResults.clear();
clearInvocations(mMockPointingAppController);
mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled = false;
- setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_INVALID_MODEM_STATE);
+ setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_RESULT_INVALID_MODEM_STATE);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
verify(mMockPointingAppController, never()).startPointingUI(anyBoolean());
assertFalse(mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled);
verify(mMockControllerMetricsStats, times(1)).reportServiceEnablementFailCount();
@@ -685,12 +693,12 @@
// Successfully enable satellite when radio is on.
mIIntegerConsumerResults.clear();
mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled = false;
- setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(true, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);
assertTrue(mSatelliteControllerUT.setSettingsKeyForSatelliteModeCalled);
assertEquals(SATELLITE_MODE_ENABLED_TRUE, mSatelliteControllerUT.satelliteModeSettingValue);
verify(mMockPointingAppController).startPointingUI(eq(false));
@@ -708,41 +716,41 @@
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(true, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);
// Fail to enable satellite with a different demo mode when it is already enabled.
mIIntegerConsumerResults.clear();
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, true, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_ARGUMENTS, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(true, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_INVALID_ARGUMENTS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);
// Successfully disable satellite.
mIIntegerConsumerResults.clear();
- setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, false, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
// Disable satellite when satellite is already disabled.
mIIntegerConsumerResults.clear();
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, false, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
// Disable satellite with a different demo mode when satellite is already disabled.
mIIntegerConsumerResults.clear();
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, false, true, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
// Send a second request while the first request in progress
mIIntegerConsumerResults.clear();
@@ -753,13 +761,13 @@
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_REQUEST_IN_PROGRESS, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_REQUEST_IN_PROGRESS, (long) mIIntegerConsumerResults.get(0));
mIIntegerConsumerResults.clear();
resetSatelliteControllerUTToSupportedAndProvisionedState();
// Should receive callback for the above request when satellite modem is turned off.
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
// Move to satellite-disabling in progress.
setUpNoResponseForRequestSatelliteEnabled(false, false);
@@ -772,52 +780,52 @@
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_ERROR, (long) mIIntegerConsumerResults.get(0));
mIIntegerConsumerResults.clear();
resetSatelliteControllerUTToOffAndProvisionedState();
// Should receive callback for the above request when satellite modem is turned off.
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
/**
* Make areAllRadiosDisabled return false and move mWaitingForRadioDisabled to true, which
* will lead to no response for requestSatelliteEnabled.
*/
mSatelliteControllerUT.allRadiosDisabled = false;
- setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertFalse(waitForIIntegerConsumerResult(1));
resetSatelliteControllerUTEnabledState();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, false, false, mIIntegerConsumer);
processAllMessages();
// We should receive 2 callbacks for the above 2 requests.
assertTrue(waitForIIntegerConsumerResult(2));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(1));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(1));
resetSatelliteControllerUTToOffAndProvisionedState();
// Repeat the same test as above but with error response from modem for the second request
mSatelliteControllerUT.allRadiosDisabled = false;
- setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertFalse(waitForIIntegerConsumerResult(1));
resetSatelliteControllerUTEnabledState();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_NO_RESOURCES);
+ setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_RESULT_NO_RESOURCES);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, false, false, mIIntegerConsumer);
processAllMessages();
// We should receive 2 callbacks for the above 2 requests.
assertTrue(waitForIIntegerConsumerResult(2));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- assertEquals(SATELLITE_NO_RESOURCES, (long) mIIntegerConsumerResults.get(1));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_NO_RESOURCES, (long) mIIntegerConsumerResults.get(1));
mSatelliteControllerUT.allRadiosDisabled = true;
}
@@ -827,42 +835,45 @@
mSatelliteControllerUT.requestSatelliteCapabilities(SUB_ID, mSatelliteCapabilitiesReceiver);
processAllMessages();
assertTrue(waitForRequestSatelliteCapabilitiesResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedSatelliteCapabilitiesResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ mQueriedSatelliteCapabilitiesResultCode);
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteCapabilities(SUB_ID, mSatelliteCapabilitiesReceiver);
processAllMessages();
assertTrue(waitForRequestSatelliteCapabilitiesResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, mQueriedSatelliteCapabilitiesResultCode);
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, mQueriedSatelliteCapabilitiesResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestSatelliteCapabilities(mSatelliteCapabilities, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestSatelliteCapabilities(mSatelliteCapabilities,
+ SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteCapabilities(SUB_ID, mSatelliteCapabilitiesReceiver);
processAllMessages();
assertTrue(waitForRequestSatelliteCapabilitiesResult(1));
- assertEquals(SATELLITE_ERROR_NONE, mQueriedSatelliteCapabilitiesResultCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedSatelliteCapabilitiesResultCode);
assertEquals(mSatelliteCapabilities, mQueriedSatelliteCapabilities);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpNullResponseForRequestSatelliteCapabilities(SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpNullResponseForRequestSatelliteCapabilities(SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteCapabilities(SUB_ID, mSatelliteCapabilitiesReceiver);
processAllMessages();
assertTrue(waitForRequestSatelliteCapabilitiesResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedSatelliteCapabilitiesResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ mQueriedSatelliteCapabilitiesResultCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpNullResponseForRequestSatelliteCapabilities(SATELLITE_INVALID_MODEM_STATE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpNullResponseForRequestSatelliteCapabilities(SATELLITE_RESULT_INVALID_MODEM_STATE);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteCapabilities(SUB_ID, mSatelliteCapabilitiesReceiver);
processAllMessages();
assertTrue(waitForRequestSatelliteCapabilitiesResult(1));
- assertEquals(SATELLITE_INVALID_MODEM_STATE, mQueriedSatelliteCapabilitiesResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE, mQueriedSatelliteCapabilitiesResultCode);
}
@Test
@@ -873,70 +884,74 @@
mStartTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.startSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStartTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.startSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStartTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- setUpResponseForStartSatelliteTransmissionUpdates(SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForStartSatelliteTransmissionUpdates(SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.startSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStartTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_SERVICE_NOT_PROVISIONED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,
+ (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- setUpResponseForStartSatelliteTransmissionUpdates(SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForStartSatelliteTransmissionUpdates(SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.startSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStartTransmissionUpdateCallback);
verify(mMockPointingAppController).registerForSatelliteTransmissionUpdates(anyInt(),
eq(mStartTransmissionUpdateCallback), any());
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
verify(mMockPointingAppController).startSatelliteTransmissionUpdates(any(Message.class),
any(Phone.class));
verify(mMockPointingAppController).setStartedSatelliteTransmissionUpdates(eq(true));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- setUpResponseForStartSatelliteTransmissionUpdates(SATELLITE_INVALID_TELEPHONY_STATE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForStartSatelliteTransmissionUpdates(SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
mSatelliteControllerUT.startSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStartTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
verify(mMockPointingAppController).unregisterForSatelliteTransmissionUpdates(anyInt(),
any(), eq(mStartTransmissionUpdateCallback), any(Phone.class));
verify(mMockPointingAppController).setStartedSatelliteTransmissionUpdates(eq(false));
@@ -950,69 +965,73 @@
mStopTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.stopSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStopTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.stopSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStopTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.stopSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStopTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_SERVICE_NOT_PROVISIONED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,
+ (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.stopSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStopTransmissionUpdateCallback);
verify(mMockPointingAppController).unregisterForSatelliteTransmissionUpdates(anyInt(),
any(), eq(mStopTransmissionUpdateCallback), any(Phone.class));
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
verify(mMockPointingAppController).stopSatelliteTransmissionUpdates(any(Message.class),
any(Phone.class));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_INVALID_TELEPHONY_STATE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForStopSatelliteTransmissionUpdates(SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
mSatelliteControllerUT.stopSatelliteTransmissionUpdates(SUB_ID, mIIntegerConsumer,
mStopTransmissionUpdateCallback);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
}
@Test
@@ -1021,51 +1040,51 @@
resetSatelliteControllerUT();
mSatelliteControllerUT.requestIsDemoModeEnabled(SUB_ID, mIsDemoModeEnabledReceiver);
assertTrue(waitForRequestIsDemoModeEnabledResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedIsDemoModeEnabledResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mQueriedIsDemoModeEnabledResultCode);
assertFalse(mQueriedIsDemoModeEnabled);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestIsDemoModeEnabled(SUB_ID, mIsDemoModeEnabledReceiver);
assertTrue(waitForRequestIsDemoModeEnabledResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, mQueriedIsDemoModeEnabledResultCode);
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, mQueriedIsDemoModeEnabledResultCode);
assertFalse(mQueriedIsDemoModeEnabled);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestIsDemoModeEnabled(SUB_ID, mIsDemoModeEnabledReceiver);
assertTrue(waitForRequestIsDemoModeEnabledResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, mQueriedIsDemoModeEnabledResultCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, mQueriedIsDemoModeEnabledResultCode);
assertFalse(mQueriedIsDemoModeEnabled);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestIsDemoModeEnabled(SUB_ID, mIsDemoModeEnabledReceiver);
assertTrue(waitForRequestIsDemoModeEnabledResult(1));
- assertEquals(SATELLITE_SERVICE_NOT_PROVISIONED, mQueriedIsDemoModeEnabledResultCode);
+ assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED, mQueriedIsDemoModeEnabledResultCode);
assertFalse(mQueriedIsDemoModeEnabled);
resetSatelliteControllerUT();
boolean isDemoModeEnabled = mSatelliteControllerUT.isDemoModeEnabled();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestIsDemoModeEnabled(SUB_ID, mIsDemoModeEnabledReceiver);
assertTrue(waitForRequestIsDemoModeEnabledResult(1));
- assertEquals(SATELLITE_ERROR_NONE, mQueriedIsDemoModeEnabledResultCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, mQueriedIsDemoModeEnabledResultCode);
assertEquals(isDemoModeEnabled, mQueriedIsDemoModeEnabled);
}
@Test
public void testIsSatelliteEnabled() {
assertFalse(mSatelliteControllerUT.isSatelliteEnabled());
- setUpResponseForRequestIsSatelliteEnabled(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);
mIsSatelliteEnabledSemaphore.drainPermits();
mSatelliteControllerUT.requestIsSatelliteEnabled(SUB_ID, mIsSatelliteEnabledReceiver);
processAllMessages();
@@ -1075,20 +1094,20 @@
@Test
public void testOnSatelliteServiceConnected() {
- verifySatelliteSupported(false, SATELLITE_RADIO_NOT_AVAILABLE);
- verifySatelliteEnabled(false, SATELLITE_INVALID_TELEPHONY_STATE);
- verifySatelliteProvisioned(false, SATELLITE_INVALID_TELEPHONY_STATE);
+ verifySatelliteSupported(false, SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
+ verifySatelliteEnabled(false, SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_INVALID_TELEPHONY_STATE);
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestSatelliteEnabled(false, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.onSatelliteServiceConnected();
processAllMessages();
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
}
@Test
@@ -1101,7 +1120,7 @@
};
int errorCode = mSatelliteControllerUT.registerForSatelliteModemStateChanged(
SUB_ID, callback);
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, errorCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, errorCode);
verify(mMockSatelliteSessionController, never())
.registerForSatelliteModemStateChanged(callback);
@@ -1109,7 +1128,7 @@
errorCode = mSatelliteControllerUT.registerForSatelliteModemStateChanged(
SUB_ID, callback);
- assertEquals(SATELLITE_ERROR_NONE, errorCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, errorCode);
verify(mMockSatelliteSessionController).registerForSatelliteModemStateChanged(callback);
}
@@ -1149,20 +1168,20 @@
};
int errorCode = mSatelliteControllerUT.registerForSatelliteProvisionStateChanged(
SUB_ID, callback);
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, errorCode);
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE, errorCode);
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
errorCode = mSatelliteControllerUT.registerForSatelliteProvisionStateChanged(
SUB_ID, callback);
- assertEquals(SATELLITE_NOT_SUPPORTED, errorCode);
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, errorCode);
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
errorCode = mSatelliteControllerUT.registerForSatelliteProvisionStateChanged(
SUB_ID, callback);
- assertEquals(SATELLITE_ERROR_NONE, errorCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, errorCode);
sendProvisionedStateChangedEvent(true, null);
processAllMessages();
@@ -1188,9 +1207,9 @@
}
};
when(mMockDatagramController.registerForSatelliteDatagram(eq(SUB_ID), eq(callback)))
- .thenReturn(SATELLITE_ERROR_NONE);
+ .thenReturn(SATELLITE_RESULT_SUCCESS);
int errorCode = mSatelliteControllerUT.registerForSatelliteDatagram(SUB_ID, callback);
- assertEquals(SATELLITE_ERROR_NONE, errorCode);
+ assertEquals(SATELLITE_RESULT_SUCCESS, errorCode);
verify(mMockDatagramController).registerForSatelliteDatagram(eq(SUB_ID), eq(callback));
}
@@ -1221,22 +1240,24 @@
SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE, datagram, true, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
verify(mMockDatagramController, never()).sendSatelliteDatagram(anyInt(),
eq(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE), eq(datagram), eq(true),
any());
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
sendProvisionedStateChangedEvent(false, null);
processAllMessages();
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.sendSatelliteDatagram(SUB_ID,
SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE, datagram, true, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_SERVICE_NOT_PROVISIONED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,
+ (long) mIIntegerConsumerResults.get(0));
verify(mMockDatagramController, never()).sendSatelliteDatagram(anyInt(),
eq(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE), eq(datagram), eq(true),
any());
@@ -1244,7 +1265,7 @@
mIIntegerConsumerResults.clear();
sendProvisionedStateChangedEvent(true, null);
processAllMessages();
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.sendSatelliteDatagram(SUB_ID,
SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE, datagram, true, mIIntegerConsumer);
processAllMessages();
@@ -1261,25 +1282,27 @@
mSatelliteControllerUT.pollPendingSatelliteDatagrams(SUB_ID, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
verify(mMockDatagramController, never()).pollPendingSatelliteDatagrams(anyInt(), any());
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
sendProvisionedStateChangedEvent(false, null);
processAllMessages();
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.pollPendingSatelliteDatagrams(SUB_ID, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_SERVICE_NOT_PROVISIONED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SERVICE_NOT_PROVISIONED,
+ (long) mIIntegerConsumerResults.get(0));
verify(mMockDatagramController, never()).pollPendingSatelliteDatagrams(anyInt(), any());
mIIntegerConsumerResults.clear();
sendProvisionedStateChangedEvent(true, null);
processAllMessages();
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.pollPendingSatelliteDatagrams(SUB_ID, mIIntegerConsumer);
processAllMessages();
assertFalse(waitForIIntegerConsumerResult(1));
@@ -1298,94 +1321,95 @@
testProvisionData, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
assertNull(cancelRemote);
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
cancelRemote = mSatelliteControllerUT.provisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN,
testProvisionData, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
assertNull(cancelRemote);
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
cancelRemote = mSatelliteControllerUT.provisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN,
testProvisionData, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
assertNull(cancelRemote);
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
setUpResponseForProvisionSatelliteService(TEST_SATELLITE_TOKEN, testProvisionData,
- SATELLITE_ERROR_NONE);
+ SATELLITE_RESULT_SUCCESS);
cancelRemote = mSatelliteControllerUT.provisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN,
testProvisionData, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
assertNotNull(cancelRemote);
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
setUpResponseForProvisionSatelliteService(TEST_SATELLITE_TOKEN, testProvisionData,
- SATELLITE_NOT_AUTHORIZED);
+ SATELLITE_RESULT_NOT_AUTHORIZED);
cancelRemote = mSatelliteControllerUT.provisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN,
testProvisionData, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_NOT_AUTHORIZED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_NOT_AUTHORIZED, (long) mIIntegerConsumerResults.get(0));
assertNotNull(cancelRemote);
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
setUpResponseForProvisionSatelliteService(TEST_NEXT_SATELLITE_TOKEN, testProvisionData,
- SATELLITE_ERROR_NONE);
+ SATELLITE_RESULT_SUCCESS);
cancelRemote = mSatelliteControllerUT.provisionSatelliteService(SUB_ID,
TEST_NEXT_SATELLITE_TOKEN, testProvisionData, mIIntegerConsumer);
cancellationSignal.setRemote(cancelRemote);
cancellationSignal.cancel();
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
verify(mMockSatelliteModemInterface).deprovisionSatelliteService(
eq(TEST_NEXT_SATELLITE_TOKEN), any(Message.class));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
setUpNoResponseForProvisionSatelliteService(TEST_SATELLITE_TOKEN);
setUpResponseForProvisionSatelliteService(TEST_NEXT_SATELLITE_TOKEN, testProvisionData,
- SATELLITE_ERROR_NONE);
+ SATELLITE_RESULT_SUCCESS);
cancelRemote = mSatelliteControllerUT.provisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN,
testProvisionData, mIIntegerConsumer);
@@ -1394,7 +1418,7 @@
testProvisionData, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_SERVICE_PROVISION_IN_PROGRESS,
+ assertEquals(SATELLITE_RESULT_SERVICE_PROVISION_IN_PROGRESS,
(long) mIIntegerConsumerResults.get(0));
}
@@ -1402,13 +1426,13 @@
public void testDeprovisionSatelliteService() {
mIIntegerConsumerSemaphore.drainPermits();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.deprovisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_NOT_SUPPORTED, (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
@@ -1416,58 +1440,60 @@
TEST_SATELLITE_TOKEN, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForDeprovisionSatelliteService(TEST_SATELLITE_TOKEN, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForDeprovisionSatelliteService(TEST_SATELLITE_TOKEN, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.deprovisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_TELEPHONY_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_TELEPHONY_STATE,
+ (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(false, SATELLITE_ERROR_NONE);
- setUpResponseForDeprovisionSatelliteService(TEST_SATELLITE_TOKEN, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(false, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForDeprovisionSatelliteService(TEST_SATELLITE_TOKEN, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.deprovisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- setUpResponseForDeprovisionSatelliteService(TEST_SATELLITE_TOKEN, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForDeprovisionSatelliteService(TEST_SATELLITE_TOKEN, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.deprovisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
resetSatelliteControllerUT();
mIIntegerConsumerResults.clear();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ setUpResponseForRequestIsSatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
setUpResponseForDeprovisionSatelliteService(TEST_SATELLITE_TOKEN,
- SATELLITE_INVALID_MODEM_STATE);
+ SATELLITE_RESULT_INVALID_MODEM_STATE);
mSatelliteControllerUT.deprovisionSatelliteService(SUB_ID,
TEST_SATELLITE_TOKEN, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
+ assertEquals(SATELLITE_RESULT_INVALID_MODEM_STATE, (long) mIIntegerConsumerResults.get(0));
}
@Test
@@ -1598,17 +1624,17 @@
private void resetSatelliteControllerUTEnabledState() {
logd("resetSatelliteControllerUTEnabledState");
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RADIO_NOT_AVAILABLE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
doNothing().when(mMockSatelliteModemInterface)
.setSatelliteServicePackageName(anyString());
mSatelliteControllerUT.setSatelliteServicePackageName("TestSatelliteService");
processAllMessages();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
sendProvisionedStateChangedEvent(true, null);
processAllMessages();
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
}
private void resetSatelliteControllerUT() {
@@ -1618,7 +1644,7 @@
processAllMessages();
// Reset all cached states
- setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RADIO_NOT_AVAILABLE);
+ setUpResponseForRequestIsSatelliteSupported(false, SATELLITE_RESULT_RADIO_NOT_AVAILABLE);
doNothing().when(mMockSatelliteModemInterface)
.setSatelliteServicePackageName(anyString());
mSatelliteControllerUT.setSatelliteServicePackageName("TestSatelliteService");
@@ -1627,11 +1653,11 @@
private void resetSatelliteControllerUTToSupportedAndProvisionedState() {
resetSatelliteControllerUT();
- setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_ERROR_NONE);
- verifySatelliteSupported(true, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestIsSatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
+ verifySatelliteSupported(true, SATELLITE_RESULT_SUCCESS);
sendProvisionedStateChangedEvent(true, null);
processAllMessages();
- verifySatelliteProvisioned(true, SATELLITE_ERROR_NONE);
+ verifySatelliteProvisioned(true, SATELLITE_RESULT_SUCCESS);
}
private void resetSatelliteControllerUTToOffAndProvisionedState() {
@@ -1639,7 +1665,7 @@
// Clean up pending resources and move satellite controller to OFF state.
sendSatelliteModemStateChangedEvent(SATELLITE_MODEM_STATE_UNAVAILABLE, null);
processAllMessages();
- verifySatelliteEnabled(false, SATELLITE_ERROR_NONE);
+ verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);
}
private void resetSatelliteControllerUTToOnAndProvisionedState() {
@@ -1647,17 +1673,17 @@
setRadioPower(true);
processAllMessages();
- setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_ERROR_NONE);
+ setUpResponseForRequestSatelliteEnabled(true, false, SATELLITE_RESULT_SUCCESS);
mSatelliteControllerUT.requestSatelliteEnabled(SUB_ID, true, false, mIIntegerConsumer);
processAllMessages();
assertTrue(waitForIIntegerConsumerResult(1));
- assertEquals(SATELLITE_ERROR_NONE, (long) mIIntegerConsumerResults.get(0));
- verifySatelliteEnabled(true, SATELLITE_ERROR_NONE);
+ assertEquals(SATELLITE_RESULT_SUCCESS, (long) mIIntegerConsumerResults.get(0));
+ verifySatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);
}
private void setUpResponseForRequestIsSatelliteEnabled(boolean isSatelliteEnabled,
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1668,8 +1694,8 @@
}
private void setUpResponseForRequestIsSatelliteSupported(
- boolean isSatelliteSupported, @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ boolean isSatelliteSupported, @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1680,8 +1706,8 @@
}
private void setUpResponseForRequestIsSatelliteAllowedForCurrentLocation(
- boolean isSatelliteAllowed, @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ boolean isSatelliteAllowed, @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1693,8 +1719,8 @@
}
private void setUpNullResponseForRequestIsSatelliteAllowedForCurrentLocation(
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1706,8 +1732,8 @@
}
private void setUpResponseForRequestTimeForNextSatelliteVisibility(
- int satelliteVisibilityTime, @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ int satelliteVisibilityTime, @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
int[] visibilityTime = new int[] {satelliteVisibilityTime};
doAnswer(invocation -> {
@@ -1720,8 +1746,8 @@
}
private void setUpNullResponseForRequestTimeForNextSatelliteVisibility(
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1733,8 +1759,8 @@
}
private void setUpResponseForRequestIsSatelliteProvisioned(
- boolean isSatelliteProvisioned, @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ boolean isSatelliteProvisioned, @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
int[] provisioned = new int[] {isSatelliteProvisioned ? 1 : 0};
doAnswer(invocation -> {
@@ -1746,8 +1772,8 @@
}
private void setUpResponseForRequestSatelliteEnabled(
- boolean enabled, boolean demoMode, @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ boolean enabled, boolean demoMode, @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
if (exception == null && !enabled) {
@@ -1767,8 +1793,8 @@
}
private void setUpResponseForProvisionSatelliteService(
- String token, byte[] provisionData, @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ String token, byte[] provisionData, @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[2];
@@ -1785,8 +1811,8 @@
}
private void setUpResponseForDeprovisionSatelliteService(String token,
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[1];
@@ -1799,8 +1825,8 @@
private void setUpResponseForRequestSatelliteCapabilities(
SatelliteCapabilities satelliteCapabilities,
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1827,8 +1853,8 @@
}
private void setUpNullResponseForRequestSatelliteCapabilities(
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1839,8 +1865,8 @@
}
private void setUpResponseForStartSatelliteTransmissionUpdates(
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
@@ -1852,8 +1878,8 @@
}
private void setUpResponseForStopSatelliteTransmissionUpdates(
- @SatelliteManager.SatelliteError int error) {
- SatelliteException exception = (error == SATELLITE_ERROR_NONE)
+ @SatelliteManager.SatelliteResult int error) {
+ SatelliteException exception = (error == SATELLITE_RESULT_SUCCESS)
? null : new SatelliteException(error);
doAnswer(invocation -> {
Message message = (Message) invocation.getArguments()[0];
diff --git a/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommenderTest.java b/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommenderTest.java
index 3def601..96eab5d 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommenderTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommenderTest.java
@@ -442,14 +442,14 @@
}
@Override
- @SatelliteManager.SatelliteError public int registerForSatelliteProvisionStateChanged(
+ @SatelliteManager.SatelliteResult public int registerForSatelliteProvisionStateChanged(
int subId, @NonNull ISatelliteProvisionStateCallback callback) {
mRegisterForSatelliteProvisionStateChangedCalls++;
Set<ISatelliteProvisionStateCallback> perSubscriptionCallbacks =
mProvisionStateChangedCallbacks.getOrDefault(subId, new HashSet<>());
perSubscriptionCallbacks.add(callback);
mProvisionStateChangedCallbacks.put(subId, perSubscriptionCallbacks);
- return SatelliteManager.SATELLITE_ERROR_NONE;
+ return SatelliteManager.SATELLITE_RESULT_SUCCESS;
}
@Override
@@ -469,7 +469,7 @@
Bundle bundle = new Bundle();
bundle.putBoolean(SatelliteManager.KEY_SATELLITE_COMMUNICATION_ALLOWED,
mIsSatelliteCommunicationAllowed);
- result.send(SatelliteManager.SATELLITE_ERROR_NONE, bundle);
+ result.send(SatelliteManager.SATELLITE_RESULT_SUCCESS, bundle);
}
public void setIsSatelliteCommunicationAllowed(boolean allowed) {