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

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

Merge "Request again when the latest signal strength report request and report... 

Merge "Request again when the latest signal strength report request and report state of modem are diferent" into 24D1-dev
parents f34c077f 9d71f946

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

+11 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ public class SatelliteController extends Handler { 
            new AtomicBoolean(false);

    private final AtomicBoolean mIsModemEnabledReportingNtnSignalStrength =

            new AtomicBoolean(false);

    private final AtomicBoolean mLatestRequestedStateForNtnSignalStrengthReport =

            new AtomicBoolean(false);

    private final AtomicBoolean mRegisteredForSatelliteSupportedStateChanged =

            new AtomicBoolean(false);

    /**
@@ -1015,6 +1017,7 @@ public class SatelliteController extends Handler { 
                        }

                    }

                    // Request Ntn signal strength report when satellite enabled or disabled done.

                    mLatestRequestedStateForNtnSignalStrengthReport.set(argument.enableSatellite);

                    updateNtnSignalStrengthReporting(argument.enableSatellite);

                } else {

                    synchronized (mSatelliteEnabledRequestLock) {
@@ -1375,6 +1378,13 @@ public class SatelliteController extends Handler { 
                                + shouldReport);

                if (errorCode == SATELLITE_RESULT_SUCCESS) {

                    mIsModemEnabledReportingNtnSignalStrength.set(shouldReport);

                    if (mLatestRequestedStateForNtnSignalStrengthReport.get()

                            != mIsModemEnabledReportingNtnSignalStrength.get()) {

                        logd("mLatestRequestedStateForNtnSignalStrengthReport does not match with "

                                + "mIsModemEnabledReportingNtnSignalStrength");

                        updateNtnSignalStrengthReporting(

                                mLatestRequestedStateForNtnSignalStrengthReport.get());

                    }

                } else {

                    loge(((boolean) request.argument ? "startSendingNtnSignalStrength"

                            : "stopSendingNtnSignalStrength") + "returns " + errorCode);
@@ -4473,6 +4483,7 @@ public class SatelliteController extends Handler { 
            return;

        }



        mLatestRequestedStateForNtnSignalStrengthReport.set(shouldReport);

        if (mIsModemEnabledReportingNtnSignalStrength.get() == shouldReport) {

            logd("handleCmdUpdateNtnSignalStrengthReporting: ignore request. "

                    + "mIsModemEnabledReportingNtnSignalStrength="