diff options
Diffstat (limited to 'satellite_client/src')
-rw-r--r-- | satellite_client/src/android/telephony/satellite/wrapper/SatelliteManagerWrapper.java | 20 | ||||
-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. |