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

Commit c855e852 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add more unit tests for SatelliteController" into udc-dev am: aab14886 am: a92e330f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/23050042



Change-Id: I008ef54f35f73103f9b4547509262fd62331de47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ad5fb8a a92e330f

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -404,6 +404,7 @@ public class DatagramReceiver extends Handler { 
                        deleteDatagram(argument.datagramId);

                        deleteDatagram(argument.datagramId);

                        sInstance.mPendingAckCountHashMap.remove(argument.datagramId);

                        sInstance.mPendingAckCountHashMap.remove(argument.datagramId);

                    }

                    }

                    break;

                }

                }





                default:

                default:

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

+14 −6
Original line number Original line Diff line number Diff line
@@ -671,7 +671,6 @@ public class SatelliteController extends Handler { 
                        if (mNeedsSatellitePointing) {

                        if (mNeedsSatellitePointing) {

                            mPointingAppController.startPointingUI(false);

                            mPointingAppController.startPointingUI(false);

                        }

                        }



                        evaluateToSendSatelliteEnabledSuccess();

                        evaluateToSendSatelliteEnabledSuccess();

                    } else {

                    } else {

                        synchronized (mSatelliteEnabledRequestLock) {

                        synchronized (mSatelliteEnabledRequestLock) {
@@ -687,9 +686,12 @@ public class SatelliteController extends Handler { 
                        resetSatelliteEnabledRequest();

                        resetSatelliteEnabledRequest();





                        setSettingsKeyForSatelliteMode(SATELLITE_MODE_ENABLED_FALSE);

                        setSettingsKeyForSatelliteMode(SATELLITE_MODE_ENABLED_FALSE);

                        setDemoModeEnabled(argument.enableDemoMode);

                        synchronized (mIsSatelliteEnabledLock) {

                            mIsSatelliteEnabled = argument.enableSatellite;

                        }

                        // If satellite is disabled, send success to callback immediately

                        // If satellite is disabled, send success to callback immediately

                        argument.callback.accept(error);

                        argument.callback.accept(error);

                        setIsDemoModeEnabled(argument.enableDemoMode);

                        updateSatelliteEnabledState(

                        updateSatelliteEnabledState(

                                argument.enableSatellite, "EVENT_SET_SATELLITE_ENABLED_DONE");

                                argument.enableSatellite, "EVENT_SET_SATELLITE_ENABLED_DONE");

                    }

                    }
@@ -2187,6 +2189,8 @@ public class SatelliteController extends Handler { 
        logd("handleEventSatelliteModemStateChanged: state=" + state);

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

        if (state == SatelliteManager.SATELLITE_MODEM_STATE_OFF

        if (state == SatelliteManager.SATELLITE_MODEM_STATE_OFF

                || state == SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE) {

                || state == SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE) {

            setSettingsKeyForSatelliteMode(SATELLITE_MODE_ENABLED_FALSE);

            setDemoModeEnabled(false);

            updateSatelliteEnabledState(

            updateSatelliteEnabledState(

                    false, "handleEventSatelliteModemStateChanged");

                    false, "handleEventSatelliteModemStateChanged");

            cleanUpResources(state);

            cleanUpResources(state);
@@ -2223,10 +2227,14 @@ public class SatelliteController extends Handler { 
            if (areAllRadiosDisabled() && (mSatelliteEnabledRequest != null)

            if (areAllRadiosDisabled() && (mSatelliteEnabledRequest != null)

                    && mWaitingForRadioDisabled) {

                    && mWaitingForRadioDisabled) {

                logd("Sending success to callback that sent enable satellite request");

                logd("Sending success to callback that sent enable satellite request");

                setIsDemoModeEnabled(mSatelliteEnabledRequest.enableDemoMode);

                setDemoModeEnabled(mSatelliteEnabledRequest.enableDemoMode);

                updateSatelliteEnabledState(mSatelliteEnabledRequest.enableSatellite,

                synchronized (mIsSatelliteEnabledLock) {

                        "EVENT_SET_SATELLITE_ENABLED_DONE");

                    mIsSatelliteEnabled = mSatelliteEnabledRequest.enableSatellite;

                }

                mSatelliteEnabledRequest.callback.accept(SatelliteManager.SATELLITE_ERROR_NONE);

                mSatelliteEnabledRequest.callback.accept(SatelliteManager.SATELLITE_ERROR_NONE);

                updateSatelliteEnabledState(

                        mSatelliteEnabledRequest.enableSatellite,

                        "EVENT_SET_SATELLITE_ENABLED_DONE");

                mSatelliteEnabledRequest = null;

                mSatelliteEnabledRequest = null;

                mWaitingForRadioDisabled = false;

                mWaitingForRadioDisabled = false;

            }

            }
@@ -2254,7 +2262,7 @@ public class SatelliteController extends Handler { 
        }

        }

    }

    }





    private void setIsDemoModeEnabled(boolean enabled) {

    private void setDemoModeEnabled(boolean enabled) {

        mIsDemoModeEnabled = enabled;

        mIsDemoModeEnabled = enabled;

        mDatagramController.setDemoMode(mIsDemoModeEnabled);

        mDatagramController.setDemoMode(mIsDemoModeEnabled);

    }

    }