commit d4a52a2f908a7699cf2a96a628a7ac9e7d93e89d
author Hakjun Choi <hakjunc@google.com> Wed Dec 13 09:48:24 2023 +0000
committer Hakjun Choi <hakjunc@google.com> Wed Jan 10 03:17:17 2024 +0000
tree 0f890c42e8d33cca991cb6eb233cef709a648667
parent 4f9c89e215c60f6cfba4a1ae29a9778aa6f9823a

Rename the callback for listening satellite modem state change event

1. Renamed from ISatelliteStateCallback to ISatelliteModemStateCallback to improve clarity of use.
2. Reflected framework change to test application.

Bug: 297933128
Test: atest SatelliteManagerTest, SatelliteManagerTestonMockService,
SatelliteSessionControllerTest, RadioOnStateListenerTest
Test: manual test using testSatelliteApp

Change-Id: Ibaa8a7dd2ed706f9f14d84bb8e01f4edb8db9113

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d8d8450..1ce9103 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -156,8 +156,8 @@
 import android.telephony.satellite.INtnSignalStrengthCallback;
 import android.telephony.satellite.ISatelliteCapabilitiesCallback;
 import android.telephony.satellite.ISatelliteDatagramCallback;
+import android.telephony.satellite.ISatelliteModemStateCallback;
 import android.telephony.satellite.ISatelliteProvisionStateCallback;
-import android.telephony.satellite.ISatelliteStateCallback;
 import android.telephony.satellite.ISatelliteTransmissionUpdateCallback;
 import android.telephony.satellite.NtnSignalStrength;
 import android.telephony.satellite.NtnSignalStrengthCallback;
@@ -13195,7 +13195,7 @@
      */
     @Override
     @SatelliteManager.SatelliteResult public int registerForSatelliteModemStateChanged(int subId,
-            @NonNull ISatelliteStateCallback callback) {
+            @NonNull ISatelliteModemStateCallback callback) {
         enforceSatelliteCommunicationPermission("registerForSatelliteModemStateChanged");
         return mSatelliteController.registerForSatelliteModemStateChanged(subId, callback);
     }
@@ -13206,13 +13206,13 @@
      *
      * @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, ISatelliteStateCallback)}.
+     * {@link #registerForSatelliteModemStateChanged(int, ISatelliteModemStateCallback)}.
      *
      * @throws SecurityException if the caller doesn't have the required permission.
      */
     @Override
     public void unregisterForSatelliteModemStateChanged(int subId,
-            @NonNull ISatelliteStateCallback callback) {
+            @NonNull ISatelliteModemStateCallback callback) {
         enforceSatelliteCommunicationPermission("unregisterForSatelliteModemStateChanged");
         mSatelliteController.unregisterForSatelliteModemStateChanged(subId, callback);
     }