Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e6fb6da authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Rename the callback for listening satellite modem state change event" into main

parents 763e329f 3cbb0ca8

src/java/com/android/internal/telephony/emergency/RadioOnStateListener.java

+3 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.os.Looper; 
import android.os.Message;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.satellite.ISatelliteStateCallback;

import android.telephony.satellite.ISatelliteModemStateCallback;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.SomeArgs;
@@ -142,7 +142,8 @@ public class RadioOnStateListener { 
        }

    };



    private final ISatelliteStateCallback mSatelliteCallback = new ISatelliteStateCallback.Stub() {

    private final ISatelliteModemStateCallback mSatelliteCallback =

            new ISatelliteModemStateCallback.Stub() {

        @Override

        public void onSatelliteModemStateChanged(int state) {

            mHandler.obtainMessage(MSG_SATELLITE_ENABLED_CHANGED).sendToTarget();

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+4 −4
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ import android.telephony.TelephonyManager; 
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.SatelliteCapabilities;
@@ -1659,7 +1659,7 @@ public class SatelliteController extends Handler { 
     * @return The {@link SatelliteManager.SatelliteResult} result of the operation.

     */

    @SatelliteManager.SatelliteResult public int registerForSatelliteModemStateChanged(int subId,

            @NonNull ISatelliteStateCallback callback) {

            @NonNull ISatelliteModemStateCallback callback) {

        if (!mFeatureFlags.oemEnabledSatelliteFlag()) {

            logd("registerForSatelliteModemStateChanged: oemEnabledSatelliteFlag is disabled");

            return SatelliteManager.SATELLITE_RESULT_NOT_SUPPORTED;
@@ -1680,10 +1680,10 @@ public class SatelliteController extends Handler { 
     *

     * @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)}.

     */

    public void unregisterForSatelliteModemStateChanged(int subId,

            @NonNull ISatelliteStateCallback callback) {

            @NonNull ISatelliteModemStateCallback callback) {

        if (!mFeatureFlags.oemEnabledSatelliteFlag()) {

            logd("unregisterForSatelliteModemStateChanged: oemEnabledSatelliteFlag is disabled");

            return;

src/java/com/android/internal/telephony/satellite/SatelliteSessionController.java

+8 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import android.os.Message; 
import android.os.RemoteException;

import android.os.SystemProperties;

import android.telephony.Rlog;

import android.telephony.satellite.ISatelliteStateCallback;

import android.telephony.satellite.ISatelliteModemStateCallback;

import android.telephony.satellite.SatelliteManager;

import android.telephony.satellite.stub.ISatelliteGateway;

import android.telephony.satellite.stub.SatelliteGatewayService;
@@ -130,7 +130,7 @@ public class SatelliteSessionController extends StateMachine { 
    private long mSatelliteStayAtListeningFromSendingMillis;

    private long mSatelliteStayAtListeningFromReceivingMillis;

    private long mSatelliteNbIotInactivityTimeoutMillis;

    private final ConcurrentHashMap<IBinder, ISatelliteStateCallback> mListeners;

    private final ConcurrentHashMap<IBinder, ISatelliteModemStateCallback> mListeners;

    @SatelliteManager.SatelliteModemState private int mCurrentState;

    final boolean mIsSatelliteSupported;

    private boolean mIsDemoMode = false;
@@ -272,7 +272,8 @@ public class SatelliteSessionController extends StateMachine { 
     *

     * @param callback The callback to handle the satellite modem state changed event.

     */

    public void registerForSatelliteModemStateChanged(@NonNull ISatelliteStateCallback callback) {

    public void registerForSatelliteModemStateChanged(

            @NonNull ISatelliteModemStateCallback callback) {

        try {

            callback.onSatelliteModemStateChanged(mCurrentState);

            mListeners.put(callback.asBinder(), callback);
@@ -286,9 +287,10 @@ public class SatelliteSessionController extends StateMachine { 
     * If callback was not registered before, the request will be ignored.

     *

     * @param callback The callback that was passed to

     *                 {@link #registerForSatelliteModemStateChanged(ISatelliteStateCallback)}.

     * {@link #registerForSatelliteModemStateChanged(ISatelliteModemStateCallback)}.

     */

    public void unregisterForSatelliteModemStateChanged(@NonNull ISatelliteStateCallback callback) {

    public void unregisterForSatelliteModemStateChanged(

            @NonNull ISatelliteModemStateCallback callback) {

        mListeners.remove(callback.asBinder());

    }
@@ -809,7 +811,7 @@ public class SatelliteSessionController extends StateMachine { 
    private void notifyStateChangedEvent(@SatelliteManager.SatelliteModemState int state) {

        mDatagramController.onSatelliteModemStateChanged(state);



        List<ISatelliteStateCallback> toBeRemoved = new ArrayList<>();

        List<ISatelliteModemStateCallback> toBeRemoved = new ArrayList<>();

        mListeners.values().forEach(listener -> {

            try {

                listener.onSatelliteModemStateChanged(state);

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ import android.telephony.ServiceState; 
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.SatelliteCapabilities;
@@ -1200,7 +1200,7 @@ public class SatelliteControllerTest extends TelephonyTest { 


    @Test

    public void testRegisterForSatelliteModemStateChanged() {

        ISatelliteStateCallback callback = new ISatelliteStateCallback.Stub() {

        ISatelliteModemStateCallback callback = new ISatelliteModemStateCallback.Stub() {

            @Override

            public void onSatelliteModemStateChanged(int state) {

                logd("onSatelliteModemStateChanged: state=" + state);
@@ -1222,7 +1222,7 @@ public class SatelliteControllerTest extends TelephonyTest { 


    @Test

    public void testUnregisterForSatelliteModemStateChanged() {

        ISatelliteStateCallback callback = new ISatelliteStateCallback.Stub() {

        ISatelliteModemStateCallback callback = new ISatelliteModemStateCallback.Stub() {

            @Override

            public void onSatelliteModemStateChanged(int state) {

                logd("onSatelliteModemStateChanged: state=" + state);

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteSessionControllerTest.java

+63 −63

File changed.

Preview size limit exceeded, changes collapsed.