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

Commit 5df4b5a7 authored by John Wang's avatar John Wang Committed by Android Git Automerger
Browse files

am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread 

Merge commit '08fb5851' into gingerbread-plus-aosp

* commit '08fb5851':
  Add flag to skip restoring network seletion.
parents 82aacdde 08fb5851

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -367,4 +367,8 @@ 


    <!-- Enables SIP on WIFI only -->

    <bool name="config_sip_wifi_only">false</bool>



    <!-- Boolean indicating if restoring network selection should be skipped -->

    <!-- The restoring is handled by modem if it is true-->

    <bool translatable="false" name="skip_restoring_network_selection">false</bool>

</resources>

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+8 −2
Original line number Diff line number Diff line
@@ -358,8 +358,14 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
                            EVENT_SIM_RECORDS_LOADED, null);

                    mNeedToRegForSimLoaded = false;

                }



                boolean skipRestoringSelection = phone.getContext().getResources().getBoolean(

                        com.android.internal.R.bool.skip_restoring_network_selection);



                if (!skipRestoringSelection) {

                    // restore the previous network selection.

                    phone.restoreSavedNetworkSelection(null);

                }

                pollState();

                // Signal strength polling stops when radio is off

                queueNextSignalStrengthPoll();