Merge "Refactor satellite APIs" into main
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a4e9355..1dc99fd 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -13036,7 +13036,7 @@
}
}
};
- mSatelliteAccessController.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(
subId, resultReceiver);
} else {
// No need to check if satellite is allowed at current location when disabling satellite
@@ -13257,15 +13257,15 @@
*
* @param subId The subId of the subscription to unregister for satellite modem state changed.
* @param callback The callback that was passed to
- * {@link #registerForSatelliteModemStateChanged(int, ISatelliteModemStateCallback)}.
+ * {@link #registerForModemStateChanged(int, ISatelliteModemStateCallback)}.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void unregisterForSatelliteModemStateChanged(int subId,
+ public void unregisterForModemStateChanged(int subId,
@NonNull ISatelliteModemStateCallback callback) {
- enforceSatelliteCommunicationPermission("unregisterForSatelliteModemStateChanged");
- mSatelliteController.unregisterForSatelliteModemStateChanged(subId, callback);
+ enforceSatelliteCommunicationPermission("unregisterForModemStateChanged");
+ mSatelliteController.unregisterForModemStateChanged(subId, callback);
}
/**
@@ -13279,10 +13279,10 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- @SatelliteManager.SatelliteResult public int registerForSatelliteDatagram(int subId,
+ @SatelliteManager.SatelliteResult public int registerForIncomingDatagram(int subId,
@NonNull ISatelliteDatagramCallback callback) {
- enforceSatelliteCommunicationPermission("registerForSatelliteDatagram");
- return mSatelliteController.registerForSatelliteDatagram(subId, callback);
+ enforceSatelliteCommunicationPermission("registerForIncomingDatagram");
+ return mSatelliteController.registerForIncomingDatagram(subId, callback);
}
/**
@@ -13291,15 +13291,15 @@
*
* @param subId The subId of the subscription to unregister for incoming satellite datagrams.
* @param callback The callback that was passed to
- * {@link #registerForSatelliteDatagram(int, ISatelliteDatagramCallback)}.
+ * {@link #registerForIncomingDatagram(int, ISatelliteDatagramCallback)}.
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void unregisterForSatelliteDatagram(int subId,
+ public void unregisterForIncomingDatagram(int subId,
@NonNull ISatelliteDatagramCallback callback) {
- enforceSatelliteCommunicationPermission("unregisterForSatelliteDatagram");
- mSatelliteController.unregisterForSatelliteDatagram(subId, callback);
+ enforceSatelliteCommunicationPermission("unregisterForIncomingDatagram");
+ mSatelliteController.unregisterForIncomingDatagram(subId, callback);
}
/**
@@ -13314,10 +13314,9 @@
*
* @throws SecurityException if the caller doesn't have required permission.
*/
- @Override
- public void pollPendingSatelliteDatagrams(int subId, IIntegerConsumer callback) {
- enforceSatelliteCommunicationPermission("pollPendingSatelliteDatagrams");
- mSatelliteController.pollPendingSatelliteDatagrams(subId, callback);
+ public void pollPendingDatagrams(int subId, IIntegerConsumer callback) {
+ enforceSatelliteCommunicationPermission("pollPendingDatagrams");
+ mSatelliteController.pollPendingDatagrams(subId, callback);
}
/**
@@ -13339,12 +13338,12 @@
* @throws SecurityException if the caller doesn't have required permission.
*/
@Override
- public void sendSatelliteDatagram(int subId, @SatelliteManager.DatagramType int datagramType,
+ public void sendDatagram(int subId, @SatelliteManager.DatagramType int datagramType,
@NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,
@NonNull IIntegerConsumer callback) {
- enforceSatelliteCommunicationPermission("sendSatelliteDatagram");
- mSatelliteController.sendSatelliteDatagram(subId, datagramType, datagram,
- needFullScreenPointingUI, callback);
+ enforceSatelliteCommunicationPermission("sendDatagram");
+ mSatelliteController.sendDatagram(subId, datagramType, datagram, needFullScreenPointingUI,
+ callback);
}
/**
@@ -13359,12 +13358,11 @@
* @throws SecurityException if the caller doesn't have the required permission.
*/
@Override
- public void requestIsSatelliteCommunicationAllowedForCurrentLocation(int subId,
+ public void requestIsCommunicationAllowedForCurrentLocation(int subId,
@NonNull ResultReceiver result) {
- enforceSatelliteCommunicationPermission(
- "requestIsSatelliteCommunicationAllowedForCurrentLocation");
- mSatelliteAccessController.requestIsSatelliteCommunicationAllowedForCurrentLocation(
- subId, result);
+ enforceSatelliteCommunicationPermission("requestIsCommunicationAllowedForCurrentLocation");
+ mSatelliteAccessController.requestIsCommunicationAllowedForCurrentLocation(subId,
+ result);
}
/**
@@ -13409,13 +13407,13 @@
*
* @throws SecurityException if the caller doesn't have required permission.
*/
- public void addSatelliteAttachRestrictionForCarrier(int subId,
+ public void addAttachRestrictionForCarrier(int subId,
@SatelliteManager.SatelliteCommunicationRestrictionReason int reason,
@NonNull IIntegerConsumer callback) {
- enforceSatelliteCommunicationPermission("addSatelliteAttachRestrictionForCarrier");
+ enforceSatelliteCommunicationPermission("addAttachRestrictionForCarrier");
final long identity = Binder.clearCallingIdentity();
try {
- mSatelliteController.addSatelliteAttachRestrictionForCarrier(subId, reason, callback);
+ mSatelliteController.addAttachRestrictionForCarrier(subId, reason, callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13432,14 +13430,13 @@
*
* @throws SecurityException if the caller doesn't have required permission.
*/
- public void removeSatelliteAttachRestrictionForCarrier(int subId,
+ public void removeAttachRestrictionForCarrier(int subId,
@SatelliteManager.SatelliteCommunicationRestrictionReason int reason,
@NonNull IIntegerConsumer callback) {
- enforceSatelliteCommunicationPermission("removeSatelliteAttachRestrictionForCarrier");
+ enforceSatelliteCommunicationPermission("removeAttachRestrictionForCarrier");
final long identity = Binder.clearCallingIdentity();
try {
- mSatelliteController.removeSatelliteAttachRestrictionForCarrier(subId, reason,
- callback);
+ mSatelliteController.removeAttachRestrictionForCarrier(subId, reason, callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13455,13 +13452,13 @@
*
* @throws SecurityException if the caller doesn't have the required permission.
*/
- public @NonNull int[] getSatelliteAttachRestrictionReasonsForCarrier(
+ public @NonNull int[] getAttachRestrictionReasonsForCarrier(
int subId) {
- enforceSatelliteCommunicationPermission("getSatelliteAttachRestrictionReasonsForCarrier");
+ enforceSatelliteCommunicationPermission("getAttachRestrictionReasonsForCarrier");
final long identity = Binder.clearCallingIdentity();
try {
Set<Integer> reasonSet =
- mSatelliteController.getSatelliteAttachRestrictionReasonsForCarrier(subId);
+ mSatelliteController.getAttachRestrictionReasonsForCarrier(subId);
return reasonSet.stream().mapToInt(i->i).toArray();
} finally {
Binder.restoreCallingIdentity(identity);
@@ -13549,12 +13546,12 @@
* @throws SecurityException if the caller doesn't have required permission.
*/
@Override
- @SatelliteManager.SatelliteResult public int registerForSatelliteCapabilitiesChanged(
+ @SatelliteManager.SatelliteResult public int registerForCapabilitiesChanged(
int subId, @NonNull ISatelliteCapabilitiesCallback callback) {
- enforceSatelliteCommunicationPermission("registerForSatelliteCapabilitiesChanged");
+ enforceSatelliteCommunicationPermission("registerForCapabilitiesChanged");
final long identity = Binder.clearCallingIdentity();
try {
- return mSatelliteController.registerForSatelliteCapabilitiesChanged(subId, callback);
+ return mSatelliteController.registerForCapabilitiesChanged(subId, callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -13566,17 +13563,17 @@
*
* @param subId The subId of the subscription to unregister for satellite capabilities change.
* @param callback The callback that was passed to.
- * {@link #registerForSatelliteCapabilitiesChanged(int, ISatelliteCapabilitiesCallback)}.
+ * {@link #registerForCapabilitiesChanged(int, ISatelliteCapabilitiesCallback)}.
*
* @throws SecurityException if the caller doesn't have required permission.
*/
@Override
- public void unregisterForSatelliteCapabilitiesChanged(
- int subId, @NonNull ISatelliteCapabilitiesCallback callback) {
- enforceSatelliteCommunicationPermission("unregisterForSatelliteCapabilitiesChanged");
+ public void unregisterForCapabilitiesChanged(int subId,
+ @NonNull ISatelliteCapabilitiesCallback callback) {
+ enforceSatelliteCommunicationPermission("unregisterForCapabilitiesChanged");
final long identity = Binder.clearCallingIdentity();
try {
- mSatelliteController.unregisterForSatelliteCapabilitiesChanged(subId, callback);
+ mSatelliteController.unregisterForCapabilitiesChanged(subId, callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index 047c0a3..76032f8 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -230,7 +230,7 @@
* for the current location if the request is successful or an error code
* if the request failed.
*/
- public void requestIsSatelliteCommunicationAllowedForCurrentLocation(int subId,
+ public void requestIsCommunicationAllowedForCurrentLocation(int subId,
@NonNull ResultReceiver result) {
if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
logd("oemEnabledSatelliteFlag is disabled");
@@ -392,7 +392,7 @@
synchronized (mLock) {
mSatelliteAllowResultReceivers.add(requestArguments.second);
if (mSatelliteAllowResultReceivers.size() > 1) {
- logd("requestIsSatelliteCommunicationAllowedForCurrentLocation is already being "
+ logd("requestIsCommunicationAllowedForCurrentLocation is already being "
+ "processed");
return;
}
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Datagram.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Datagram.java
index 8ffbc0a..015ddcd 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Datagram.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Datagram.java
@@ -82,25 +82,25 @@
setContentView(R.layout.activity_Datagram);
findViewById(R.id.startSatelliteTransmissionUpdates)
- .setOnClickListener(this::startSatelliteTransmissionUpdatesApp);
+ .setOnClickListener(this::startTransmissionUpdatesApp);
findViewById(R.id.stopSatelliteTransmissionUpdates)
- .setOnClickListener(this::stopSatelliteTransmissionUpdatesApp);
+ .setOnClickListener(this::stopTransmissionUpdatesApp);
findViewById(R.id.pollPendingSatelliteDatagrams)
- .setOnClickListener(this::pollPendingSatelliteDatagramsApp);
+ .setOnClickListener(this::pollPendingDatagramsApp);
findViewById(R.id.sendSatelliteDatagram)
- .setOnClickListener(this::sendSatelliteDatagramApp);
+ .setOnClickListener(this::sendDatagramApp);
findViewById(R.id.registerForSatelliteDatagram)
- .setOnClickListener(this::registerForSatelliteDatagramApp);
+ .setOnClickListener(this::registerForIncomingDatagramApp);
findViewById(R.id.unregisterForSatelliteDatagram)
- .setOnClickListener(this::unregisterForSatelliteDatagramApp);
+ .setOnClickListener(this::unregisterForIncomingDatagramApp);
findViewById(R.id.showDatagramSendStateTransition)
.setOnClickListener(this::showDatagramSendStateTransitionApp);
findViewById(R.id.showDatagramReceiveStateTransition)
.setOnClickListener(this::showDatagramReceiveStateTransitionApp);
findViewById(R.id.registerForSatelliteModemStateChanged)
- .setOnClickListener(this::registerForSatelliteModemStateChangedApp);
+ .setOnClickListener(this::registerForModemStateChangedApp);
findViewById(R.id.unregisterForSatelliteModemStateChanged)
- .setOnClickListener(this::unregisterForSatelliteModemStateChangedApp);
+ .setOnClickListener(this::unregisterForModemStateChangedApp);
findViewById(R.id.showSatelliteModemStateTransition)
.setOnClickListener(this::showSatelliteModemStateTransitionApp);
@@ -166,10 +166,10 @@
}
}
- private void startSatelliteTransmissionUpdatesApp(View view) {
+ private void startTransmissionUpdatesApp(View view) {
TextView textView = findViewById(R.id.text_id);
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
- mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, error::offer);
+ mSatelliteManager.requestEnabled(true, true, Runnable::run, error::offer);
TextView showErrorStatusTextView = findViewById(R.id.showErrorStatus);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
@@ -186,7 +186,7 @@
return;
}
error.clear();
- mSatelliteManager.startSatelliteTransmissionUpdates(Runnable::run, error::offer, mCallback);
+ mSatelliteManager.startTransmissionUpdates(Runnable::run, error::offer, mCallback);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
@@ -202,10 +202,10 @@
}
}
- private void stopSatelliteTransmissionUpdatesApp(View view) {
+ private void stopTransmissionUpdatesApp(View view) {
TextView textView = findViewById(R.id.text_id);
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
- mSatelliteManager.stopSatelliteTransmissionUpdates(mCallback, Runnable::run, error::offer);
+ mSatelliteManager.stopTransmissionUpdates(mCallback, Runnable::run, error::offer);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
@@ -220,7 +220,7 @@
textView.setText("stopSatelliteTransmissionUpdates exception caught =" + e);
}
}
- private void pollPendingSatelliteDatagramsApp(View view) {
+ private void pollPendingDatagramsApp(View view) {
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
TextView showErrorStatusTextView = findViewById(R.id.showErrorStatus);
TextView textView = findViewById(R.id.text_id);
@@ -228,7 +228,7 @@
if (SatelliteTestApp.getTestSatelliteService() != null) {
SatelliteTestApp.getTestSatelliteService().sendOnPendingDatagrams();
}
- mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, resultListener::offer);
+ mSatelliteManager.requestEnabled(true, true, Runnable::run, resultListener::offer);
try {
Integer value = resultListener.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
@@ -246,61 +246,61 @@
showErrorStatusTextView.setText("Enable SatelliteService exception caught = " + e);
return;
}
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
try {
Integer value = resultListener.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
textView.setText("Timed out for poll message");
} else if (value != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
- textView.setText("Failed to pollPendingSatelliteDatagrams with error = "
+ textView.setText("Failed to pollPendingDatagrams with error = "
+ SatelliteErrorUtils.mapError(value));
} else {
- textView.setText("pollPendingSatelliteDatagrams is successful");
+ textView.setText("pollPendingDatagrams is successful");
}
} catch (InterruptedException e) {
- textView.setText("pollPendingSatelliteDatagrams exception caught =" + e);
+ textView.setText("pollPendingDatagrams exception caught =" + e);
}
}
- private void sendSatelliteDatagramApp(View view) {
+ private void sendDatagramApp(View view) {
TextView textView = findViewById(R.id.text_id);
mSatelliteManager.setDeviceAlignedWithSatellite(true);
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
String mText = "This is a test datagram message";
SatelliteDatagram datagram = new SatelliteDatagram(mText.getBytes());
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
try {
Integer value = resultListener.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
- textView.setText("Timed out for sendSatelliteDatagram");
+ textView.setText("Timed out for sendDatagram");
} else if (value != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
- textView.setText("Failed to sendSatelliteDatagram with error = "
+ textView.setText("Failed to sendDatagram with error = "
+ SatelliteErrorUtils.mapError(value));
} else {
- textView.setText("sendSatelliteDatagram is successful");
+ textView.setText("sendDatagram is successful");
}
} catch (InterruptedException e) {
- textView.setText("sendSatelliteDatagram exception caught =" + e);
+ textView.setText("sendDatagram exception caught =" + e);
}
}
- private void registerForSatelliteDatagramApp(View view) {
- int result = mSatelliteManager.registerForSatelliteDatagram(Runnable::run,
+ private void registerForIncomingDatagramApp(View view) {
+ int result = mSatelliteManager.registerForIncomingDatagram(Runnable::run,
mDatagramCallback);
TextView textView = findViewById(R.id.text_id);
if (result == 0) {
- textView.setText("registerForSatelliteDatagram is successful");
+ textView.setText("registerForIncomingDatagram is successful");
} else {
- textView.setText("Status for registerForSatelliteDatagram : "
+ textView.setText("Status for registerForIncomingDatagram : "
+ SatelliteErrorUtils.mapError(result));
}
}
- private void unregisterForSatelliteDatagramApp(View view) {
- mSatelliteManager.unregisterForSatelliteDatagram(mDatagramCallback);
+ private void unregisterForIncomingDatagramApp(View view) {
+ mSatelliteManager.unregisterForIncomingDatagram(mDatagramCallback);
TextView textView = findViewById(R.id.text_id);
- textView.setText("unregisterForSatelliteDatagram is successful");
+ textView.setText("unregisterForIncomingDatagram is successful");
}
private void showDatagramSendStateTransitionApp(View view) {
@@ -315,22 +315,22 @@
+ mShowDatagramReceiveStateTransition);
}
- private void registerForSatelliteModemStateChangedApp(View view) {
- int result = mSatelliteManager.registerForSatelliteModemStateChanged(Runnable::run,
+ private void registerForModemStateChangedApp(View view) {
+ int result = mSatelliteManager.registerForModemStateChanged(Runnable::run,
mStateCallback);
TextView textView = findViewById(R.id.text_id);
if (result == 0) {
- textView.setText("registerForSatelliteModemStateChanged is successful");
+ textView.setText("registerForModemStateChanged is successful");
} else {
- textView.setText("Status for registerForSatelliteModemStateChanged : "
+ textView.setText("Status for registerForModemStateChanged : "
+ SatelliteErrorUtils.mapError(result));
}
}
- private void unregisterForSatelliteModemStateChangedApp(View view) {
- mSatelliteManager.unregisterForSatelliteModemStateChanged(mStateCallback);
+ private void unregisterForModemStateChangedApp(View view) {
+ mSatelliteManager.unregisterForModemStateChanged(mStateCallback);
TextView textView = findViewById(R.id.text_id);
- textView.setText("unregisterForSatelliteModemStateChanged is successful");
+ textView.setText("unregisterForModemStateChanged is successful");
}
private void showSatelliteModemStateTransitionApp(View view) {
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/MultipleSendReceive.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/MultipleSendReceive.java
index 3c0b2fd..0e5ab4f 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/MultipleSendReceive.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/MultipleSendReceive.java
@@ -66,20 +66,20 @@
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 4);
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
- mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, resultListener::offer);
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.requestEnabled(true, true, Runnable::run, resultListener::offer);
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 3);
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 2);
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 1);
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 0);
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
try {
Integer value = resultListener.poll(1000, TimeUnit.MILLISECONDS);
TextView textView = findViewById(R.id.text_id);
@@ -100,15 +100,15 @@
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
String mText = "This is a test datagram message";
SatelliteDatagram datagram = new SatelliteDatagram(mText.getBytes());
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
try {
Integer value = resultListener.poll(1000, TimeUnit.MILLISECONDS);
@@ -127,27 +127,27 @@
private void multipleSendReceiveSatelliteDatagramApp(View view) {
mSatelliteManager.setDeviceAlignedWithSatellite(true);
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
- mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, resultListener::offer);
+ mSatelliteManager.requestEnabled(true, true, Runnable::run, resultListener::offer);
String mText = "This is a test datagram message";
SatelliteDatagram datagram = new SatelliteDatagram(mText.getBytes());
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 4);
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 3);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 2);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 1);
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, resultListener::offer);
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 0);
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java
index 940435e..20c5ef5 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Provisioning.java
@@ -55,15 +55,15 @@
setContentView(R.layout.activity_Provisioning);
findViewById(R.id.provisionSatelliteService)
- .setOnClickListener(this::provisionSatelliteServiceApp);
+ .setOnClickListener(this::provisionServiceApp);
findViewById(R.id.deprovisionSatelliteService)
- .setOnClickListener(this::deprovisionSatelliteServiceApp);
+ .setOnClickListener(this::deprovisionServiceApp);
findViewById(R.id.requestIsSatelliteProvisioned)
- .setOnClickListener(this::requestIsSatelliteProvisionedApp);
+ .setOnClickListener(this::requestIsProvisionedApp);
findViewById(R.id.registerForSatelliteProvisionStateChanged)
- .setOnClickListener(this::registerForSatelliteProvisionStateChangedApp);
+ .setOnClickListener(this::registerForProvisionStateChangedApp);
findViewById(R.id.unregisterForSatelliteProvisionStateChanged)
- .setOnClickListener(this::unregisterForSatelliteProvisionStateChangedApp);
+ .setOnClickListener(this::unregisterForProvisionStateChangedApp);
findViewById(R.id.showCurrentSatelliteProvisionState)
.setOnClickListener(this::showCurrentSatelliteProvisionStateApp);
findViewById(R.id.Back).setOnClickListener(new OnClickListener() {
@@ -84,13 +84,13 @@
}
}
- private void provisionSatelliteServiceApp(View view) {
+ private void provisionServiceApp(View view) {
TextView textView = findViewById(R.id.text_id);
CancellationSignal cancellationSignal = new CancellationSignal();
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
String mText = "This is test provision data.";
byte[] testProvisionData = mText.getBytes();
- mSatelliteManager.provisionSatelliteService("SATELLITE_TOKEN", testProvisionData,
+ mSatelliteManager.provisionService("SATELLITE_TOKEN", testProvisionData,
cancellationSignal, Runnable::run, error::offer);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
@@ -107,10 +107,10 @@
}
}
- private void deprovisionSatelliteServiceApp(View view) {
+ private void deprovisionServiceApp(View view) {
TextView textView = findViewById(R.id.text_id);
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
- mSatelliteManager.deprovisionSatelliteService("SATELLITE_TOKEN", Runnable::run,
+ mSatelliteManager.deprovisionService("SATELLITE_TOKEN", Runnable::run,
error::offer);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
@@ -127,7 +127,7 @@
}
}
- private void requestIsSatelliteProvisionedApp(View view) {
+ private void requestIsProvisionedApp(View view) {
final AtomicReference<Boolean> enabled = new AtomicReference<>();
final AtomicReference<Integer> errorCode = new AtomicReference<>();
OutcomeReceiver<Boolean, SatelliteManager.SatelliteException> mReceiver =
@@ -148,19 +148,19 @@
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- mSatelliteManager.requestIsSatelliteProvisioned(Runnable::run, mReceiver);
+ mSatelliteManager.requestIsProvisioned(Runnable::run, mReceiver);
}
- private void registerForSatelliteProvisionStateChangedApp(View view) {
- int result = mSatelliteManager.registerForSatelliteProvisionStateChanged(Runnable::run,
+ private void registerForProvisionStateChangedApp(View view) {
+ int result = mSatelliteManager.registerForProvisionStateChanged(Runnable::run,
mCallback);
TextView textView = findViewById(R.id.text_id);
textView.setText("Status for registerForSatelliteProvisionStateChanged : "
+ SatelliteErrorUtils.mapError(result));
}
- private void unregisterForSatelliteProvisionStateChangedApp(View view) {
- mSatelliteManager.unregisterForSatelliteProvisionStateChanged(mCallback);
+ private void unregisterForProvisionStateChangedApp(View view) {
+ mSatelliteManager.unregisterForProvisionStateChanged(mCallback);
TextView textView = findViewById(R.id.text_id);
textView.setText("unregisterForSatelliteProvisionStateChanged is successful");
}
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
index 4e339a3..2d01aec 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SatelliteControl.java
@@ -52,16 +52,15 @@
findViewById(R.id.disableSatellite)
.setOnClickListener(this::disableSatelliteApp);
findViewById(R.id.requestIsSatelliteEnabled)
- .setOnClickListener(this::requestIsSatelliteEnabledApp);
+ .setOnClickListener(this::requestIsEnabledApp);
findViewById(R.id.requestIsDemoModeEnabled)
.setOnClickListener(this::requestIsDemoModeEnabledApp);
findViewById(R.id.requestIsSatelliteSupported)
- .setOnClickListener(this::requestIsSatelliteSupportedApp);
+ .setOnClickListener(this::requestIsSupportedApp);
findViewById(R.id.requestSatelliteCapabilities)
- .setOnClickListener(this::requestSatelliteCapabilitiesApp);
+ .setOnClickListener(this::requestCapabilitiesApp);
findViewById(R.id.requestIsSatelliteCommunicationAllowedForCurrentLocation)
- .setOnClickListener(
- this::requestIsSatelliteCommunicationAllowedForCurrentLocationApp);
+ .setOnClickListener(this::requestIsCommunicationAllowedForCurrentLocationApp);
findViewById(R.id.requestTimeForNextSatelliteVisibility)
.setOnClickListener(this::requestTimeForNextSatelliteVisibilityApp);
findViewById(R.id.Back).setOnClickListener(new OnClickListener() {
@@ -74,7 +73,7 @@
private void enableSatelliteApp(View view) {
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
- mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, error::offer);
+ mSatelliteManager.requestEnabled(true, true, Runnable::run, error::offer);
TextView textView = findViewById(R.id.text_id);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
@@ -93,7 +92,7 @@
private void disableSatelliteApp(View view) {
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
- mSatelliteManager.requestSatelliteEnabled(false, true, Runnable::run, error::offer);
+ mSatelliteManager.requestEnabled(false, true, Runnable::run, error::offer);
TextView textView = findViewById(R.id.text_id);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
@@ -110,7 +109,7 @@
}
}
- private void requestIsSatelliteEnabledApp(View view) {
+ private void requestIsEnabledApp(View view) {
final AtomicReference<Boolean> enabled = new AtomicReference<>();
final AtomicReference<Integer> errorCode = new AtomicReference<>();
OutcomeReceiver<Boolean, SatelliteManager.SatelliteException> receiver =
@@ -120,9 +119,9 @@
enabled.set(result);
TextView textView = findViewById(R.id.text_id);
if (enabled.get()) {
- textView.setText("requestIsSatelliteEnabled is true");
+ textView.setText("requestIsEnabled is true");
} else {
- textView.setText("Status for requestIsSatelliteEnabled result : "
+ textView.setText("Status for requestIsEnabled result : "
+ enabled.get());
}
}
@@ -131,11 +130,11 @@
public void onError(SatelliteManager.SatelliteException exception) {
errorCode.set(exception.getErrorCode());
TextView textView = findViewById(R.id.text_id);
- textView.setText("Status for requestIsSatelliteEnabled error : "
+ textView.setText("Status for requestIsEnabled error : "
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- mSatelliteManager.requestIsSatelliteEnabled(Runnable::run, receiver);
+ mSatelliteManager.requestIsEnabled(Runnable::run, receiver);
}
private void requestIsDemoModeEnabledApp(View view) {
@@ -166,7 +165,7 @@
mSatelliteManager.requestIsDemoModeEnabled(Runnable::run, receiver);
}
- private void requestIsSatelliteSupportedApp(View view) {
+ private void requestIsSupportedApp(View view) {
final AtomicReference<Boolean> enabled = new AtomicReference<>();
final AtomicReference<Integer> errorCode = new AtomicReference<>();
OutcomeReceiver<Boolean, SatelliteManager.SatelliteException> receiver =
@@ -176,9 +175,9 @@
enabled.set(result);
TextView textView = findViewById(R.id.text_id);
if (enabled.get()) {
- textView.setText("requestIsSatelliteSupported is true");
+ textView.setText("requestIsSupported is true");
} else {
- textView.setText("Status for requestIsSatelliteSupported result : "
+ textView.setText("Status for requestIsSupported result : "
+ enabled.get());
}
}
@@ -187,14 +186,14 @@
public void onError(SatelliteManager.SatelliteException exception) {
errorCode.set(exception.getErrorCode());
TextView textView = findViewById(R.id.text_id);
- textView.setText("Status for requestIsSatelliteSupported error : "
+ textView.setText("Status for requestIsSupported error : "
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- mSatelliteManager.requestIsSatelliteSupported(Runnable::run, receiver);
+ mSatelliteManager.requestIsSupported(Runnable::run, receiver);
}
- private void requestSatelliteCapabilitiesApp(View view) {
+ private void requestCapabilitiesApp(View view) {
final AtomicReference<SatelliteCapabilities> capabilities = new AtomicReference<>();
final AtomicReference<Integer> errorCode = new AtomicReference<>();
OutcomeReceiver<SatelliteCapabilities, SatelliteManager.SatelliteException> receiver =
@@ -203,7 +202,7 @@
public void onResult(SatelliteCapabilities result) {
capabilities.set(result);
TextView textView = findViewById(R.id.text_id);
- textView.setText("Status for requestSatelliteCapabilities result: "
+ textView.setText("Status for requestCapabilities result: "
+ capabilities.get());
}
@@ -211,17 +210,17 @@
public void onError(SatelliteManager.SatelliteException exception) {
errorCode.set(exception.getErrorCode());
TextView textView = findViewById(R.id.text_id);
- textView.setText("Status for requestSatelliteCapabilities error : "
+ textView.setText("Status for requestCapabilities error : "
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- mSatelliteManager.requestSatelliteCapabilities(Runnable::run, receiver);
+ mSatelliteManager.requestCapabilities(Runnable::run, receiver);
}
- private void requestIsSatelliteCommunicationAllowedForCurrentLocationApp(View view) {
+ private void requestIsCommunicationAllowedForCurrentLocationApp(View view) {
final AtomicReference<Boolean> enabled = new AtomicReference<>();
final AtomicReference<Integer> errorCode = new AtomicReference<>();
- String display = "requestIsSatelliteCommunicationAllowedForCurrentLocation";
+ String display = "requestIsCommunicationAllowedForCurrentLocation";
OutcomeReceiver<Boolean, SatelliteManager.SatelliteException> receiver =
new OutcomeReceiver<>() {
@Override
@@ -244,7 +243,7 @@
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- mSatelliteManager.requestIsSatelliteCommunicationAllowedForCurrentLocation(Runnable::run,
+ mSatelliteManager.requestIsCommunicationAllowedForCurrentLocation(Runnable::run,
receiver);
}
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
index a64aa5d..b5e82b1 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
@@ -124,7 +124,7 @@
SatelliteDatagram datagram = new SatelliteDatagram(mMessageInput.getBytes());
//Sending Message
- mSatelliteManager.sendSatelliteDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
+ mSatelliteManager.sendDatagram(SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
datagram, true, Runnable::run, error::offer);
TextView messageStatusTextView = findViewById(R.id.messageStatus);
try {
@@ -139,7 +139,7 @@
+ mEnterMessage.getText().toString());
}
} catch (InterruptedException e) {
- messageStatusTextView.setText("sendSatelliteDatagram exception caught = " + e);
+ messageStatusTextView.setText("sendDatagram exception caught = " + e);
}
}
@@ -148,16 +148,16 @@
byte[] testProvisionData = mMessageOutput.getBytes();
setupForTransferringDatagram(testProvisionData);
- int result = mSatelliteManager.registerForSatelliteDatagram(Runnable::run, mCallback);
+ int result = mSatelliteManager.registerForIncomingDatagram(Runnable::run, mCallback);
TextView showErrorStatusTextView = findViewById(R.id.showErrorStatus);
if (result != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
- showErrorStatusTextView.setText("Status for registerForSatelliteDatagram : "
+ showErrorStatusTextView.setText("Status for registerForIncomingDatagram : "
+ SatelliteErrorUtils.mapError(result));
}
if (SatelliteTestApp.getTestSatelliteService() != null) {
SatelliteTestApp.getTestSatelliteService().sendOnPendingDatagrams();
}
- mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, resultListener::offer);
+ mSatelliteManager.requestEnabled(true, true, Runnable::run, resultListener::offer);
try {
Integer value = resultListener.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
@@ -173,7 +173,7 @@
return;
}
- mSatelliteManager.pollPendingSatelliteDatagrams(Runnable::run, resultListener::offer);
+ mSatelliteManager.pollPendingDatagrams(Runnable::run, resultListener::offer);
try {
Integer value = resultListener.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
@@ -185,7 +185,7 @@
mMessageStatusTextView.setText("Successfully polled pending messages");
}
} catch (InterruptedException e) {
- mMessageStatusTextView.setText("pollPendingSatelliteDatagrams exception caught = " + e);
+ mMessageStatusTextView.setText("pollPendingDatagrams exception caught = " + e);
}
}
@@ -195,7 +195,7 @@
LinkedBlockingQueue<Integer> error = new LinkedBlockingQueue<>(1);
//Provisioning
- mSatelliteManager.provisionSatelliteService("SATELLITE_TOKEN", provisionData,
+ mSatelliteManager.provisionService("SATELLITE_TOKEN", provisionData,
cancellationSignal, Runnable::run, error::offer);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
@@ -233,12 +233,12 @@
+ SatelliteErrorUtils.mapError(errorCode.get()));
}
};
- mSatelliteManager.requestSatelliteCapabilities(Runnable::run, receiver);
+ mSatelliteManager.requestCapabilities(Runnable::run, receiver);
//Satellite Position
SatelliteTransmissionUpdateCallbackTestApp callback =
new SatelliteTransmissionUpdateCallbackTestApp();
- mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, error::offer);
+ mSatelliteManager.requestEnabled(true, true, Runnable::run, error::offer);
try {
Integer value = error.poll(TIMEOUT, TimeUnit.MILLISECONDS);
if (value == null) {
@@ -254,7 +254,7 @@
}
error.clear();
- mSatelliteManager.startSatelliteTransmissionUpdates(Runnable::run, error::offer, callback);
+ mSatelliteManager.startTransmissionUpdates(Runnable::run, error::offer, callback);
// Position update
android.telephony.satellite.stub.PointingInfo pointingInfo =
new android.telephony.satellite.stub.PointingInfo();
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java
index 929a2e5..9bea30c 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteService.java
@@ -330,14 +330,14 @@
if (mLocalListener != null) {
runWithExecutor(() -> mLocalListener.onPollPendingSatelliteDatagrams());
} else {
- loge("pollPendingSatelliteDatagrams: mLocalListener is null");
+ loge("pollPendingDatagrams: mLocalListener is null");
}
}
@Override
public void sendSatelliteDatagram(@NonNull SatelliteDatagram datagram, boolean isEmergency,
@NonNull IIntegerConsumer errorCallback) {
- logd("sendSatelliteDatagram: mErrorCode=" + mErrorCode);
+ logd("sendDatagram: mErrorCode=" + mErrorCode);
if (mErrorCode != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
runWithExecutor(() -> errorCallback.accept(mErrorCode));
} else {
@@ -347,7 +347,7 @@
if (mLocalListener != null) {
runWithExecutor(() -> mLocalListener.onSendSatelliteDatagram(datagram, isEmergency));
} else {
- loge("sendSatelliteDatagram: mLocalListener is null");
+ loge("sendDatagram: mLocalListener is null");
}
}
@@ -365,7 +365,7 @@
@Override
public void requestIsSatelliteCommunicationAllowedForCurrentLocation(
@NonNull IIntegerConsumer errorCallback, @NonNull IBooleanConsumer callback) {
- logd("requestIsSatelliteCommunicationAllowedForCurrentLocation: mErrorCode=" + mErrorCode);
+ logd("requestIsCommunicationAllowedForCurrentLocation: mErrorCode=" + mErrorCode);
if (mErrorCode != SatelliteResult.SATELLITE_RESULT_SUCCESS) {
runWithExecutor(() -> errorCallback.accept(mErrorCode));
return;
diff --git a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
index cbbd621..e4c2005 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/TestSatelliteWrapper.java
@@ -72,9 +72,9 @@
findViewById(R.id.isOnlyNonTerrestrialNetworkSubscription)
.setOnClickListener(this::isOnlyNonTerrestrialNetworkSubscription);
findViewById(R.id.registerForSatelliteCapabilitiesChanged)
- .setOnClickListener(this::registerForSatelliteCapabilitiesChanged);
+ .setOnClickListener(this::registerForCapabilitiesChanged);
findViewById(R.id.unregisterForSatelliteCapabilitiesChanged)
- .setOnClickListener(this::unregisterForSatelliteCapabilitiesChanged);
+ .setOnClickListener(this::unregisterForCapabilitiesChanged);
findViewById(R.id.Back).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@@ -112,8 +112,8 @@
mNtnSignalStrengthCallback);
}
if (mSatelliteCapabilitiesCallback != null) {
- Log.d(TAG, "unregisterForSatelliteCapabilitiesChanged()");
- mSatelliteManagerWrapper.unregisterForSatelliteCapabilitiesChanged(
+ Log.d(TAG, "unregisterForCapabilitiesChanged()");
+ mSatelliteManagerWrapper.unregisterForCapabilitiesChanged(
mSatelliteCapabilitiesCallback);
}
}
@@ -212,9 +212,9 @@
}
}
- private void registerForSatelliteCapabilitiesChanged(View view) {
- addLogMessage("registerForSatelliteCapabilitiesChanged");
- Log.d(TAG, "registerForSatelliteCapabilitiesChanged()");
+ private void registerForCapabilitiesChanged(View view) {
+ addLogMessage("registerForCapabilitiesChanged");
+ Log.d(TAG, "registerForCapabilitiesChanged()");
if (mSatelliteCapabilitiesCallback == null) {
mSatelliteCapabilitiesCallback =
SatelliteCapabilities -> {
@@ -225,7 +225,7 @@
};
}
- int result = mSatelliteManagerWrapper.registerForSatelliteCapabilitiesChanged(mExecutor,
+ int result = mSatelliteManagerWrapper.registerForCapabilitiesChanged(mExecutor,
mSatelliteCapabilitiesCallback);
if (result != SatelliteManagerWrapper.SATELLITE_RESULT_SUCCESS) {
String onError = translateResultCodeToString(result);
@@ -235,11 +235,11 @@
}
}
- private void unregisterForSatelliteCapabilitiesChanged(View view) {
- addLogMessage("unregisterForSatelliteCapabilitiesChanged");
- Log.d(TAG, "unregisterForSatelliteCapabilitiesChanged()");
+ private void unregisterForCapabilitiesChanged(View view) {
+ addLogMessage("unregisterForCapabilitiesChanged");
+ Log.d(TAG, "unregisterForCapabilitiesChanged()");
if (mSatelliteCapabilitiesCallback != null) {
- mSatelliteManagerWrapper.unregisterForSatelliteCapabilitiesChanged(
+ mSatelliteManagerWrapper.unregisterForCapabilitiesChanged(
mSatelliteCapabilitiesCallback);
mSatelliteCapabilitiesCallback = null;
addLogMessage("mSatelliteCapabilitiesCallback was unregistered");
diff --git a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
index f8c5051..c44b347 100644
--- a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
+++ b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
@@ -268,7 +268,7 @@
public void testRequestIsSatelliteCommunicationAllowedForCurrentLocation() throws Exception {
// OEM-enabled satellite is not supported
when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(false);
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
assertTrue(waitForRequestIsSatelliteAllowedForCurrentLocationResult(
@@ -277,14 +277,14 @@
// OEM-enabled satellite is supported, but SatelliteController returns error for the query
when(mMockFeatureFlags.oemEnabledSatelliteFlag()).thenReturn(true);
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
anyInt(), mResultReceiverFromSatelliteControllerCaptor.capture());
clearInvocations(mMockSatelliteController);
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver2);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController, never())
@@ -304,7 +304,7 @@
// SatelliteController returns success result but the result bundle does not have
// KEY_SATELLITE_COMMUNICATION_ALLOWED
clearAllInvocations();
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -317,7 +317,7 @@
// SatelliteController returns disallowed result
clearAllInvocations();
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -332,7 +332,7 @@
// country code is not in the allowed list
clearAllInvocations();
when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(listOf("US", "IN"));
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -347,7 +347,7 @@
// country codes are in the allowed list
clearAllInvocations();
when(mMockCountryDetector.getCurrentNetworkCountryIso()).thenReturn(listOf("US", "CA"));
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -367,7 +367,7 @@
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(2L);
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -406,7 +406,7 @@
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(0L);
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -438,7 +438,7 @@
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
when(mMockCountryDetector.getCachedLocationCountryIsoInfo()).thenReturn(new Pair<>("", 0L));
when(mMockCountryDetector.getCachedNetworkCountryIsoInfo()).thenReturn(new HashMap<>());
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -477,7 +477,7 @@
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(0L);
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -513,7 +513,7 @@
mSatelliteAccessControllerUT.elapsedRealtimeNanos = TEST_LOCATION_FRESH_DURATION_NANOS + 1;
when(mMockLocation0.getElapsedRealtimeNanos()).thenReturn(0L);
when(mMockLocation1.getElapsedRealtimeNanos()).thenReturn(0L);
- mSatelliteAccessControllerUT.requestIsSatelliteCommunicationAllowedForCurrentLocation(
+ mSatelliteAccessControllerUT.requestIsCommunicationAllowedForCurrentLocation(
SUB_ID, mSatelliteAllowedReceiver);
mTestableLooper.processAllMessages();
verify(mMockSatelliteController).requestIsSatelliteCommunicationAllowedForCurrentLocation(
@@ -550,7 +550,7 @@
try {
if (!semaphore.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS)) {
logd("Timeout to receive "
- + "requestIsSatelliteCommunicationAllowedForCurrentLocation()"
+ + "requestIsCommunicationAllowedForCurrentLocation()"
+ " callback");
return false;
}