summaryrefslogtreecommitdiff
path: root/satellite_client/src
diff options
context:
space:
mode:
authorHakjun Choi <hakjunc@google.com>2023-12-13 09:50:40 +0000
committerHakjun Choi <hakjunc@google.com>2023-12-21 04:57:31 +0000
commitad6737024bddd19b4712645eba6a32bd04fd8ca6 (patch)
treef2dbf497a90398bb0a307e27b7efc7e96f33ebf4 /satellite_client/src
parent08c263538e10fa424621774a623530d41c6fa1de (diff)
downloadgsma_services-ad6737024bddd19b4712645eba6a32bd04fd8ca6.tar.gz
Reflect the name change of API to satellite manager wrapper
Renamed from ISatelliteStateCallbackWrapper to ISatelliteModemStateCallbackWrapper to reflect the API name change from telephony framework. Bug: 297933128 Test: manual test using testSatelliteApprelfect API council Change-Id: I9c76f9f70b6900493097b0c89626ba507505073e
Diffstat (limited to 'satellite_client/src')
-rw-r--r--satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java20
-rw-r--r--satellite_client/src/android/telephony/satellite/wrapper/SatelliteModemStateCallbackWrapper.java (renamed from satellite_client/src/android/telephony/satellite/wrapper/SatelliteStateCallbackWrapper.java)2
2 files changed, 12 insertions, 10 deletions
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
index ff36bf5..66f4ebc 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java
@@ -37,8 +37,8 @@ import android.telephony.satellite.SatelliteCapabilitiesCallback;
import android.telephony.satellite.SatelliteDatagram;
import android.telephony.satellite.SatelliteDatagramCallback;
import android.telephony.satellite.SatelliteManager;
+import android.telephony.satellite.SatelliteModemStateCallback;
import android.telephony.satellite.SatelliteProvisionStateCallback;
-import android.telephony.satellite.SatelliteStateCallback;
import android.telephony.satellite.SatelliteTransmissionUpdateCallback;
import com.android.internal.telephony.flags.Flags;
@@ -69,8 +69,9 @@ public class SatelliteManagerWrapper {
SatelliteProvisionStateCallbackWrapper, SatelliteProvisionStateCallback>
sSatelliteProvisionStateCallbackWrapperMap = new ConcurrentHashMap<>();
- private static final ConcurrentHashMap<SatelliteStateCallbackWrapper, SatelliteStateCallback>
- sSatelliteStateCallbackWrapperMap = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap<SatelliteModemStateCallbackWrapper,
+ SatelliteModemStateCallback> sSatelliteModemStateCallbackWrapperMap =
+ new ConcurrentHashMap<>();
private static final ConcurrentHashMap<
SatelliteTransmissionUpdateCallbackWrapper, SatelliteTransmissionUpdateCallback>
@@ -619,14 +620,14 @@ public class SatelliteManagerWrapper {
@SatelliteResult
public int registerForSatelliteModemStateChanged(
@NonNull @CallbackExecutor Executor executor,
- @NonNull SatelliteStateCallbackWrapper callback) {
- SatelliteStateCallback internalCallback =
- new SatelliteStateCallback() {
+ @NonNull SatelliteModemStateCallbackWrapper callback) {
+ SatelliteModemStateCallback internalCallback =
+ new SatelliteModemStateCallback() {
public void onSatelliteModemStateChanged(@SatelliteModemState int state) {
callback.onSatelliteModemStateChanged(state);
}
};
- sSatelliteStateCallbackWrapperMap.put(callback, internalCallback);
+ sSatelliteModemStateCallbackWrapperMap.put(callback, internalCallback);
int result =
mSatelliteManager.registerForSatelliteModemStateChanged(executor, internalCallback);
@@ -638,8 +639,9 @@ public class SatelliteManagerWrapper {
* before, the request will be ignored.
*/
public void unregisterForSatelliteModemStateChanged(
- @NonNull SatelliteStateCallbackWrapper callback) {
- SatelliteStateCallback internalCallback = sSatelliteStateCallbackWrapperMap.get(callback);
+ @NonNull SatelliteModemStateCallbackWrapper callback) {
+ SatelliteModemStateCallback internalCallback = sSatelliteModemStateCallbackWrapperMap.get(
+ callback);
if (internalCallback != null) {
mSatelliteManager.unregisterForSatelliteModemStateChanged(internalCallback);
}
diff --git a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteStateCallbackWrapper.java b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteModemStateCallbackWrapper.java
index 3d57fa0..450e48a 100644
--- a/satellite_client/src/android/telephony/satellite/wrapper/SatelliteStateCallbackWrapper.java
+++ b/satellite_client/src/android/telephony/satellite/wrapper/SatelliteModemStateCallbackWrapper.java
@@ -17,7 +17,7 @@
package android.telephony.satellite.wrapper;
/** A callback class for monitoring satellite modem state change events. */
-public interface SatelliteStateCallbackWrapper {
+public interface SatelliteModemStateCallbackWrapper {
/**
* Called when satellite modem state changes.