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

Commit ad6eebb8 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Set demoModeEnabled true or false immediately." into main

parents ef88ca3b 5621a794

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

+1 −1
Original line number Diff line number Diff line
@@ -1010,6 +1010,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);
@@ -3754,7 +3755,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;