Renamed onDeviceAlignedWithSatellite to setDeviceAlignedWithSatellite
Bug: 293095418
Test: atest android.telephony.satellite.cts.SatelliteManagerTestOnMockService --rerun-until-failure 100
Change-Id: I3871f67d5ec7745ec5b23ed8a0f94083b5bc0df0
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3c7ee80..c7ba5ad 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -12431,9 +12431,9 @@
*/
@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
- public void onDeviceAlignedWithSatellite(int subId, @NonNull boolean isAligned) {
+ public void setDeviceAlignedWithSatellite(int subId, @NonNull boolean isAligned) {
enforceSatelliteCommunicationPermission("informDeviceAlignedToSatellite");
- mSatelliteController.onDeviceAlignedWithSatellite(subId, isAligned);
+ mSatelliteController.setDeviceAlignedWithSatellite(subId, isAligned);
}
/**
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 599f08b..96a4873 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Datagram.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/Datagram.java
@@ -224,7 +224,7 @@
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
TextView showErrorStatusTextView = findViewById(R.id.showErrorStatus);
TextView textView = findViewById(R.id.text_id);
- mSatelliteManager.onDeviceAlignedWithSatellite(true);
+ mSatelliteManager.setDeviceAlignedWithSatellite(true);
if (SatelliteTestApp.getTestSatelliteService() != null) {
SatelliteTestApp.getTestSatelliteService().sendOnPendingDatagrams();
}
@@ -264,7 +264,7 @@
private void sendSatelliteDatagramApp(View view) {
TextView textView = findViewById(R.id.text_id);
- mSatelliteManager.onDeviceAlignedWithSatellite(true);
+ mSatelliteManager.setDeviceAlignedWithSatellite(true);
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
String mText = "This is a test datagram message";
SatelliteDatagram datagram = new SatelliteDatagram(mText.getBytes());
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 b9cfc35..3c0b2fd 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/MultipleSendReceive.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/MultipleSendReceive.java
@@ -61,7 +61,7 @@
}
private void multiplePollPendingSatelliteDatagramsApp(View view) {
- mSatelliteManager.onDeviceAlignedWithSatellite(true);
+ mSatelliteManager.setDeviceAlignedWithSatellite(true);
SatelliteTestApp.getTestSatelliteService().sendOnPendingDatagrams();
SatelliteTestApp.getTestSatelliteService().sendOnSatelliteDatagramReceived(
mReceivedDatagram, 4);
@@ -96,7 +96,7 @@
private void multipleSendSatelliteDatagramApp(View view) {
- mSatelliteManager.onDeviceAlignedWithSatellite(true);
+ mSatelliteManager.setDeviceAlignedWithSatellite(true);
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
String mText = "This is a test datagram message";
SatelliteDatagram datagram = new SatelliteDatagram(mText.getBytes());
@@ -125,7 +125,7 @@
}
private void multipleSendReceiveSatelliteDatagramApp(View view) {
- mSatelliteManager.onDeviceAlignedWithSatellite(true);
+ mSatelliteManager.setDeviceAlignedWithSatellite(true);
LinkedBlockingQueue<Integer> resultListener = new LinkedBlockingQueue<>(1);
mSatelliteManager.requestSatelliteEnabled(true, true, Runnable::run, resultListener::offer);
String mText = "This is a test datagram message";
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 3bd3775..4a9d006 100644
--- a/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
+++ b/testapps/TestSatelliteApp/src/com/android/phone/testapps/satellitetestapp/SendReceive.java
@@ -278,6 +278,6 @@
+ e);
}
//Device is aligned with the satellite for demo mode
- mSatelliteManager.onDeviceAlignedWithSatellite(true);
+ mSatelliteManager.setDeviceAlignedWithSatellite(true);
}
}