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

Commit 5621a794 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Set demoModeEnabled true or false immediately. 

After receiving EVENT_SET_SATELLITE_ENABLED_STATE_CHANGED,
demoModeEnabled should be set to true or false instead of setting it
after all radios are turned off. With this change, modem state changes
from PixelSatelliteService will be blocked immediately after satellite
is enabled in demo mode.

Bug: 347791463
Test: b/349192992
Flag: EXEMPT bugfix

Change-Id: Iee712ddd77f60f7d7dad21a43a337080a538ce4c
parent 6f2189d1

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

+1 −1
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ public class SatelliteController extends Handler { 
                    if (argument.enableSatellite) {

                        synchronized (mSatelliteEnabledRequestLock) {

                            mWaitingForRadioDisabled = true;

                            setDemoModeEnabled(argument.enableDemoMode);

                        }

                        setSettingsKeyForSatelliteMode(SATELLITE_MODE_ENABLED_TRUE);

                        setSettingsKeyToAllowDeviceRotation(SATELLITE_MODE_ENABLED_TRUE);
@@ -3753,7 +3754,6 @@ public class SatelliteController extends Handler { 
            if (areAllRadiosDisabled() && (mSatelliteEnabledRequest != null)

                    && mWaitingForRadioDisabled) {

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

                setDemoModeEnabled(mSatelliteEnabledRequest.enableDemoMode);

                mIsEmergency = mSatelliteEnabledRequest.isEmergency;

                synchronized (mIsSatelliteEnabledLock) {

                    mIsSatelliteEnabled = mSatelliteEnabledRequest.enableSatellite;