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

Commit e20173ae authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28020232'] into 24Q3-release. 

Change-Id: I8adb642d0258304ed7538d02a2d64aebd4c6dd7a
parents fd916079 1a24ac4b

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);
@@ -3762,7 +3763,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;